Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 4 deletions

diff --git a/spec/controllers/projects/pipeline_schedules_controller_spec.rb b/spec/controllers/projects/pipeline_schedules_controller_spec.rb
index fa90a0d9abc..5bcfae4227c 100644
--- a/spec/controllers/projects/pipeline_schedules_controller_spec.rb
+++ b/spec/controllers/projects/pipeline_schedules_controller_spec.rb
@@ -354,13 +354,14 @@ RSpec.describe Projects::PipelineSchedulesController do
     end
 
     def go
-      put :update, params: {
+      put :update,
+        params: {
           namespace_id: project.namespace.to_param,
           project_id: project,
           id: pipeline_schedule,
           schedule: schedule
         },
-                   as: :html
+        as: :html
     end
   end
 
diff --git a/spec/controllers/projects/service_desk_controller_spec.rb b/spec/controllers/projects/service_desk_controller_spec.rb
index bc507a033dc..e078bf9461e 100644
--- a/spec/controllers/projects/service_desk_controller_spec.rb
+++ b/spec/controllers/projects/service_desk_controller_spec.rb
@@ -4,8 +4,9 @@ require 'spec_helper'
 
 RSpec.describe Projects::ServiceDeskController do
   let_it_be(:project) do
-    create(:project, :private, :custom_repo, service_desk_enabled: true,
-                                             files: { '.gitlab/issue_templates/service_desk.md' => 'template' })
+    create(:project, :private, :custom_repo,
+      service_desk_enabled: true,
+      files: { '.gitlab/issue_templates/service_desk.md' => 'template' })
   end
 
   let_it_be(:user) { create(:user) }