summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorAdam Niedzielski <adamsunday@gmail.com>2016-11-16 12:46:07 +0100
committerAdam Niedzielski <adamsunday@gmail.com>2016-11-16 12:46:07 +0100
commitef3be00a0297dfa31002616df6ee49a0e2132cb7 (patch)
tree2316894b87a84db4ecb8ddcd96eba046aeb2a47b /app/controllers
parent0f48abf24b0ba34aebfc1d0d52e9e22648b7da1a (diff)
downloadgitlab-ce-ef3be00a0297dfa31002616df6ee49a0e2132cb7.tar.gz
Defer saving project services to the database if there are no user changesadam-build-missing-services-when-necessary
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects/services_controller.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index 97e6e9471e0..40a23a6f806 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -10,8 +10,7 @@ class Projects::ServicesController < Projects::ApplicationController
layout "project_settings"
def index
- @project.build_missing_services
- @services = @project.services.visible.reload
+ @services = @project.find_or_initialize_services
end
def edit
@@ -46,6 +45,6 @@ class Projects::ServicesController < Projects::ApplicationController
private
def service
- @service ||= @project.services.find { |service| service.to_param == params[:id] }
+ @service ||= @project.find_or_initialize_service(params[:id])
end
end