diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 8fa1d53d2..a8581835a 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -119,7 +119,6 @@ Layout/ElseAlignment:
     - 'app/helpers/application_helper.rb'
     - 'app/helpers/attachments_helper.rb'
     - 'app/helpers/queries_helper.rb'
-    - 'app/models/changeset.rb'
     - 'app/models/issue_query.rb'
     - 'lib/redmine/export/pdf/issues_pdf_helper.rb'
     - 'lib/redmine/i18n.rb'
diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index ba64916bd..6a0b42df8 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -161,11 +161,7 @@ class Changeset < ActiveRecord::Base
     if repository && repository.identifier.present?
       repo = "#{repository.identifier}|"
     end
-    tag = if scmid?
-      "commit:#{repo}#{scmid}"
-    else
-      "#{repo}r#{revision}"
-    end
+    tag = scmid? ? "commit:#{repo}#{scmid}" : "#{repo}r#{revision}"
     if ref_project && project && ref_project != project
       tag = "#{project.identifier}:#{tag}"
     end