Fix new offenses

app/controllers/concerns/spammable_actions.rb

@@ -27,7 +27,7 @@ module SpammableActions
 
       render :verify
     else
-      fallback.call
+      yield
     end
   end
 

app/models/project_services/pushover_service.rb

@@ -55,7 +55,7 @@ class PushoverService < Service
           ['Pushover Echo (long)', 'echo'],
           ['Up Down (long)', 'updown'],
           ['None (silent)', 'none']
-        ]},
+        ] },
     ]
   end
 

config/initializers/metrics.rb

@@ -22,7 +22,7 @@ def instrument_classes(instrumentation)
   paths_to_instrument = {
     %w(app finders)               => %w(app finders),
     %w(app mailers emails)        => %w(app mailers),
-    ['app', 'services', '**']             => %w(app services),
+    %w(app services **)           => %w(app services),
     %w(lib gitlab conflicts)      => ['lib'],
     %w(lib gitlab diff)           => ['lib'],
     %w(lib gitlab email message)  => ['lib'],

spec/lib/expand_variables_spec.rb

@@ -15,41 +15,41 @@ describe ExpandVariables do
         result: 'keyvalue',
         variables: [
           { key: 'variable', value: 'value' }
-        ]},
+        ] },
       { value: 'key${variable}',
         result: 'keyvalue',
         variables: [
           { key: 'variable', value: 'value' }
-        ]},
+        ] },
       { value: 'key$variable$variable2',
         result: 'keyvalueresult',
         variables: [
           { key: 'variable', value: 'value' },
           { key: 'variable2', value: 'result' },
-        ]},
+        ] },
       { value: 'key${variable}${variable2}',
         result: 'keyvalueresult',
         variables: [
           { key: 'variable', value: 'value' },
           { key: 'variable2', value: 'result' }
-        ]},
+        ] },
       { value: 'key$variable2$variable',
         result: 'keyresultvalue',
         variables: [
           { key: 'variable', value: 'value' },
           { key: 'variable2', value: 'result' },
-        ]},
+        ] },
       { value: 'key${variable2}${variable}',
         result: 'keyresultvalue',
         variables: [
           { key: 'variable', value: 'value' },
           { key: 'variable2', value: 'result' }
-        ]},
+        ] },
       { value: 'review/$CI_BUILD_REF_NAME',
         result: 'review/feature/add-review-apps',
         variables: [
           { key: 'CI_BUILD_REF_NAME', value: 'feature/add-review-apps' }
-        ]},
+        ] },
     ]
 
     tests.each do |test|

spec/lib/gitlab/import_sources_spec.rb

@@ -23,14 +23,15 @@ describe Gitlab::ImportSources do
     it 'returns an array' do
       expected =
         %w(
-github 
-bitbucket 
-gitlab 
-google_code 
-fogbugz 
-git 
-gitlab_project 
-gitea)
+          github
+          bitbucket
+          gitlab
+          google_code
+          fogbugz
+          git
+          gitlab_project
+          gitea
+        )
 
       expect(described_class.values).to eq(expected)
     end
@@ -40,13 +41,14 @@ gitea)
     it 'returns an array of importer names' do
       expected =
         %w(
-github 
-bitbucket 
-gitlab 
-google_code 
-fogbugz 
-gitlab_project 
-gitea)
+          github
+          bitbucket
+          gitlab
+          google_code
+          fogbugz
+          gitlab_project
+          gitea
+        )
 
       expect(described_class.importer_names).to eq(expected)
     end

spec/requests/api/labels_spec.rb

@@ -22,9 +22,10 @@ describe API::Labels, api: true  do
       create(:labeled_merge_request, labels: [priority_label], author: user, source_project: project )
 
       expected_keys = %w(
-id name color description 
-open_issues_count closed_issues_count open_merge_requests_count 
-subscribed priority)
+        id name color description
+        open_issues_count closed_issues_count open_merge_requests_count
+        subscribed priority
+      )
 
       get api("/projects/#{project.id}/labels", user)
 

spec/requests/api/v3/labels_spec.rb

@@ -22,9 +22,10 @@ describe API::V3::Labels, api: true  do
       create(:labeled_merge_request, labels: [priority_label], author: user, source_project: project )
 
       expected_keys = %w(
-id name color description 
-open_issues_count closed_issues_count open_merge_requests_count 
-subscribed priority)
+        id name color description
+        open_issues_count closed_issues_count open_merge_requests_count
+        subscribed priority
+      )
 
       get v3_api("/projects/#{project.id}/labels", user)
 

spec/services/merge_requests/resolve_service_spec.rb

@@ -60,7 +60,7 @@ describe MergeRequests::ResolveService do
         it 'creates a commit with the correct parents' do
           expect(merge_request.source_branch_head.parents.map(&:id))
             .to eq(%w(1450cd639e0bc6721eb02800169e464f212cde06 
-824be604a34828eb682305f0d963056cfac87b2d))
+                      824be604a34828eb682305f0d963056cfac87b2d))
         end
       end
 
@@ -126,7 +126,7 @@ describe MergeRequests::ResolveService do
       it 'creates a commit with the correct parents' do
         expect(merge_request.source_branch_head.parents.map(&:id))
           .to eq(%w(1450cd639e0bc6721eb02800169e464f212cde06 
-824be604a34828eb682305f0d963056cfac87b2d))
+                    824be604a34828eb682305f0d963056cfac87b2d))
       end
 
       it 'sets the content to the content given' do

spec/support/repo_helpers.rb

@@ -101,11 +101,12 @@ eos
     ]
 
     commits = %w(
-5937ac0a7beb003549fc5fd26fc247adbce4a52e 
-570e7b2abdd848b95f2f578043fc23bd6f6fd24d 
-6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9 
-d14d6c0abdd253381df51a723d58691b2ee1ab08 
-c1acaa58bbcbc3eafe538cb8274ba387047b69f8).reverse # last commit is recent one
+      5937ac0a7beb003549fc5fd26fc247adbce4a52e
+      570e7b2abdd848b95f2f578043fc23bd6f6fd24d
+      6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
+      d14d6c0abdd253381df51a723d58691b2ee1ab08
+      c1acaa58bbcbc3eafe538cb8274ba387047b69f8
+    ).reverse # last commit is recent one
 
     OpenStruct.new(
       source_branch: 'master',