diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 7b1915ffc84..468d42b6523 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -6,13 +6,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 31
-# Cop supports --auto-correct.
-Layout/ClosingParenthesisIndentation:
-  Exclude:
-    - 'src/api/app/views/statistics/rating.xml.builder'
-    - 'src/api/test/unit/project_test.rb'
-
 # Offense count: 68
 # Cop supports --auto-correct.
 Layout/CommentIndentation:
diff --git a/src/api/app/views/statistics/rating.xml.builder b/src/api/app/views/statistics/rating.xml.builder
index cc03a586404..0e787fb6016 100644
--- a/src/api/app/views/statistics/rating.xml.builder
+++ b/src/api/app/views/statistics/rating.xml.builder
@@ -3,12 +3,12 @@ if @package && @project
   xml.rating( @rating[:score],
               :count => @rating[:count], :project => @project, :package => @package,
               :user_score => @rating[:user_score]
-  )
+            )
 elsif @project
   xml.rating( @rating[:score],
               :count => @rating[:count], :project => @project,
               :user_score => @rating[:user_score]
-  )
+            )
 else
   xml.rating
 end
diff --git a/src/api/test/unit/project_test.rb b/src/api/test/unit/project_test.rb
index 5f6055ba556..06fa152caba 100644
--- a/src/api/test/unit/project_test.rb
+++ b/src/api/test/unit/project_test.rb
@@ -50,7 +50,7 @@ def test_flags_inheritance
           <arch>x86_64</arch>
         </repository>
        </project>"
-      )
+    )
 
     project.update_from_xml(axml)
     project.store
@@ -143,7 +143,7 @@ def test_flags_inheritance
           <arch>x86_64</arch>
         </repository>
        </project>"
-      )
+    )
 
     project.update_from_xml!(axml)
     project.store
@@ -280,7 +280,7 @@ def test_flags_inheritance
           <arch>x86_64</arch>
         </repository>
        </project>"
-      )
+    )
 
     project2.update_from_xml(axml)
     project2.store
@@ -410,7 +410,7 @@ def test_add_new_flags_from_xml
           <disable repository='10.0' arch='i586'/>
         </debuginfo>
       </project>"
-      )
+    )
 
     position = 1
     %w(build publish debuginfo).each do |flagtype|
@@ -459,7 +459,7 @@ def test_delete_flags_through_xml
         <title>Iggy's Home Project</title>
         <description>dummy</description>
       </project>"
-      )
+    )
 
     @project.update_all_flags(axml)
     assert_equal 0, @project.flags.of_type('build').size
@@ -482,7 +482,7 @@ def test_store_axml
         <url></url>
         <disable/>
       </project>"
-      )
+    )
 
     @project.update_from_xml!(axml)
     @project.save!
@@ -508,7 +508,7 @@ def test_ordering
           <arch>x86_64</arch>
         </repository>
       </project>"
-      )
+    )
     @project.update_from_xml!(axml)
     @project.reload
 
@@ -530,7 +530,7 @@ def test_ordering
           <arch>local</arch>
         </repository>
       </project>"
-      )
+    )
     @project.update_from_xml!(axml)
 
     xml = @project.render_xml
@@ -552,7 +552,7 @@ def test_maintains
           <maintains project='BaseDistro'/>
         </maintenance>
       </project>"
-      )
+    )
     @project.update_from_xml!(axml)
     @project.reload
     xml = @project.render_xml
@@ -568,7 +568,7 @@ def test_maintains
           <maintains project='BaseDistro2.0'/>
         </maintenance>
       </project>"
-      )
+    )
     @project.update_from_xml!(axml)
     @project.reload
     xml = @project.render_xml
@@ -584,7 +584,7 @@ def test_maintains
           <maintains project='BaseDistro2.0'/>
         </maintenance>
       </project>"
-      )
+    )
     @project.update_from_xml!(axml)
     @project.reload
     xml = @project.render_xml
@@ -598,7 +598,7 @@ def test_maintains
         <title>Iggy's Home Project</title>
         <description>dummy</description>
       </project>"
-      )
+    )
     @project.update_from_xml!(axml)
     @project.reload
     xml = @project.render_xml
@@ -620,7 +620,7 @@ def test_maintains
          <arch>i586</arch>
        </repository>
      </project>"
-     )
+    )
     assert_raise(ActiveRecord::RecordInvalid) do
       Project.transaction do
         @project.update_from_xml!(axml)
@@ -695,7 +695,7 @@ def test_handle_project_links
         <description>dummy</description>
         <link project='home:Iggy' />
       </project>"
-      )
+    )
     project_a = Project.create( name: "home:Iggy:A" )
     project_a.update_from_xml!(axml)
     project_a.store
@@ -707,7 +707,7 @@ def test_handle_project_links
         <description>dummy</description>
         <link project='home:Iggy:A' />
       </project>"
-      )
+    )
     project_b = Project.create( name: "home:Iggy:B" )
     project_b.update_from_xml!(axml)
     project_b.store
@@ -742,8 +742,7 @@ def test_repository_with_download_url
           <arch>i586</arch>
         </repository>
       </project>"
-      )
-    )
+    ))
 
     xml = prj.to_axml
     assert_xml_tag xml, tag: :download, attributes: {arch: "i586", url: "http://me.org", repotype: "rpmmd"}
@@ -795,8 +794,7 @@ def test_repository_path_sync
         <description/>
         <repository name='sp0_ga' />
       </project>"
-      )
-    )
+    ))
     prj = Project.new(name: "Enterprise-SP0:Update")
     prj.update_from_xml!( Xmlhash.parse(
       "<project name='Enterprise-SP0:Update' kind='maintenance_release'>
@@ -806,8 +804,7 @@ def test_repository_path_sync
           <path project='Enterprise-SP0:GA' repository='sp0_ga' />
         </repository>
       </project>"
-      )
-    )
+    ))
     prj = Project.new(name: "Enterprise-SP1:GA")
     prj.update_from_xml!( Xmlhash.parse(
       "<project name='Enterprise-SP1:GA'>
@@ -817,8 +814,7 @@ def test_repository_path_sync
           <path project='Enterprise-SP0:GA' repository='sp0_ga' />
         </repository>
       </project>"
-      )
-    )
+    ))
     prj = Project.new(name: "Enterprise-SP1:Update")
     prj.update_from_xml!( Xmlhash.parse(
       "<project name='Enterprise-SP1:Update' kind='maintenance_release'>
@@ -829,8 +825,7 @@ def test_repository_path_sync
           <path project='Enterprise-SP0:Update' repository='sp0_update' />
         </repository>
       </project>"
-      )
-    )
+    ))
     prj = Project.new(name: "Enterprise-SP1:Channel:Server")
     prj.update_from_xml!( Xmlhash.parse(
       "<project name='Enterprise-SP1:Channel:Server'>
@@ -840,8 +835,7 @@ def test_repository_path_sync
           <path project='Enterprise-SP1:Update' repository='sp1_update' />
         </repository>
       </project>"
-      )
-    )
+    ))
     # this is what the classic add_repository call is producing:
     prj = Project.new(name: "My:Branch")
     prj.update_from_xml!( Xmlhash.parse(
@@ -858,8 +852,7 @@ def test_repository_path_sync
           <path project='Enterprise-SP1:Update' repository='sp1_update' />
         </repository>
       </project>"
-      )
-    )
+    ))
     # however, this is not correct, because my:branch (or an incident)
     # is providing in this situation often a package in SP0:Update which
     # must be used for building the package in sp1 repo.
@@ -919,26 +912,29 @@ def test_cycle_handling
     User.current = users( :king )
 
     prj_a = Project.new(name: "Project:A")
-    prj_a.update_from_xml!( Xmlhash.parse(
+    prj_a.update_from_xml!(Xmlhash.parse(
       "<project name='Project:A'>
         <title/>
         <description/>
-       </project>") )
+       </project>"
+    ))
     prj_a.save!
     prj_b = Project.new(name: "Project:B")
-    prj_b.update_from_xml!( Xmlhash.parse(
+    prj_b.update_from_xml!(Xmlhash.parse(
       "<project name='Project:B'>
         <title/>
         <description/>
         <link project='Project:A'/>
-       </project>") )
+       </project>"
+    ))
     prj_b.save!
-    prj_a.update_from_xml!( Xmlhash.parse(
+    prj_a.update_from_xml!(Xmlhash.parse(
       "<project name='Project:A'>
         <title/>
         <description/>
         <link project='Project:B'/>
-       </project>") )
+       </project>"
+    ))
     prj_a.save!
 
     assert_equal [], prj_a.expand_all_packages