[CE upstream] fix rubocop & spec

.rubocop.yml

@@ -276,7 +276,7 @@ Style/IdenticalConditionalBranches:
   Enabled: false
 
 # Checks the indentation of the first line of the right-hand-side of a
-# multi-line assignment. 
+# multi-line assignment.
 Style/IndentAssignment:
   Enabled: false
 
@@ -691,7 +691,7 @@ Style/ZeroLengthPredicate:
 # branches, and conditions.
 Metrics/AbcSize:
   Enabled: true
-  Max: 60
+  Max: 64
 
 # Avoid excessive block nesting.
 Metrics/BlockNesting:

spec/models/project_spec.rb

@@ -435,8 +435,8 @@ describe Project, models: true do
       stub_request(:post, project_hook.url)
       stub_request(:post, group_hook.url)
 
-      expect_any_instance_of(ProjectHook).to receive(:async_execute).and_return(true)
       expect_any_instance_of(GroupHook).to receive(:async_execute).and_return(true)
+      expect_any_instance_of(ProjectHook).to receive(:async_execute).and_return(true)
 
       project.execute_hooks({}, :push_hooks)
     end