diff options
author | Rémy Coutable <remy@rymai.me> | 2018-06-05 18:30:46 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-06-05 18:30:46 +0300 |
commit | 17e30a3212df7ed2f6d57d64371ce594a66439ca (patch) | |
tree | c910233c6d3ad1fb6849ea31f8eee874af90f751 /app/services | |
parent | ffe87460f0925f6e091352552ba52aecea5bf4a8 (diff) | |
parent | c75baaa4ba91e4b23b2f21419af052ac7222bdbe (diff) |
Merge branch 'ce-6021-extract-ee-services' into 'master'
Backport changes in some EE service objects
See merge request gitlab-org/gitlab-ce!19119
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/application_settings/update_service.rb | 2 | ||||
-rw-r--r-- | app/services/applications/create_service.rb | 3 | ||||
-rw-r--r-- | app/services/test_hooks/project_service.rb | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/app/services/application_settings/update_service.rb b/app/services/application_settings/update_service.rb index e70445cfb67..7bcb8f49d0d 100644 --- a/app/services/application_settings/update_service.rb +++ b/app/services/application_settings/update_service.rb @@ -1,5 +1,7 @@ module ApplicationSettings class UpdateService < ApplicationSettings::BaseService + attr_reader :params, :application_setting + def execute update_terms(@params.delete(:terms)) diff --git a/app/services/applications/create_service.rb b/app/services/applications/create_service.rb index 35d45f25a71..e67af929954 100644 --- a/app/services/applications/create_service.rb +++ b/app/services/applications/create_service.rb @@ -2,8 +2,7 @@ module Applications class CreateService def initialize(current_user, params) @current_user = current_user - @params = params - @ip_address = @params.delete(:ip_address) + @params = params.except(:ip_address) end def execute(request = nil) diff --git a/app/services/test_hooks/project_service.rb b/app/services/test_hooks/project_service.rb index 01d5d774cd5..65183e84cce 100644 --- a/app/services/test_hooks/project_service.rb +++ b/app/services/test_hooks/project_service.rb @@ -1,11 +1,13 @@ module TestHooks class ProjectService < TestHooks::BaseService - private + attr_writer :project def project @project ||= hook.project end + private + def push_events_data throw(:validation_error, 'Ensure the project has at least one commit.') if project.empty_repo? |