Fix updating settings for pipelines15343-build-settiings

2 files changed, 8 insertions, 15 deletions

diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index 990adb15133..55b68b89d0d 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -50,20 +50,14 @@ class Projects::PipelinesController < Projects::ApplicationController
   end
 
   def update_settings
-    status = ::Projects::UpdateService.new(@project, current_user, pipelines_settings_params).execute
-
-    respond_to do |format|
-      if status
-        flash[:notice] = "CI/CD Pipelines settings for '#{@project.name}' was successfully updated."
-        format.html do
-          redirect_to(
-            settings_namespace_project_pipelines_path(@project.namespace, @project),
-            notice: "CI/CD Pipelines settings for '#{@project.name}' was successfully updated."
-          )
-        end
-      else
-        format.html { render 'settings' }
-      end
+    if @project.update_attributes(pipelines_settings_params)
+      flash[:notice] = "CI/CD Pipelines settings for '#{@project.name}' was successfully updated."
+      redirect_to(
+        settings_namespace_project_pipelines_path(@project.namespace, @project),
+        notice: "CI/CD Pipelines settings for '#{@project.name}' was successfully updated."
+      )
+    else
+      render 'settings'
     end
   end
 
diff --git a/app/services/projects/update_service.rb b/app/services/projects/update_service.rb
index 47dbc214968..f06311511cc 100644
--- a/app/services/projects/update_service.rb
+++ b/app/services/projects/update_service.rb
@@ -23,7 +23,6 @@ module Projects
         if project.previous_changes.include?('path')
           project.rename_repo
         end
-        true
       end
     end
   end