From 7338800787d571475810f26d7e921d8eb0382737 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Wed, 13 Sep 2017 17:02:26 +0900 Subject: Fix PipelineTriggerService to associate trigger_request with builds --- app/services/ci/pipeline_trigger_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/services') diff --git a/app/services/ci/pipeline_trigger_service.rb b/app/services/ci/pipeline_trigger_service.rb index 1e5ad28ba57..120af8c1e61 100644 --- a/app/services/ci/pipeline_trigger_service.rb +++ b/app/services/ci/pipeline_trigger_service.rb @@ -14,7 +14,7 @@ module Ci pipeline = Ci::CreatePipelineService.new(project, trigger.owner, ref: params[:ref]) .execute(:trigger, ignore_skip_ci: true) do |pipeline| - trigger.trigger_requests.create!(pipeline: pipeline) + pipeline.trigger_requests.create!(trigger: trigger) create_pipeline_variables!(pipeline) end -- cgit v1.2.1 From cc2daa74d83c98dc05dd92f0950a122b46b83c96 Mon Sep 17 00:00:00 2001 From: haseeb Date: Fri, 15 Sep 2017 15:35:24 +0000 Subject: created services for keys --- app/services/deploy_keys/create_service.rb | 7 +++++++ app/services/gpg_keys/create_service.rb | 9 +++++++++ app/services/keys/base_service.rb | 13 +++++++++++++ app/services/keys/create_service.rb | 9 +++++++++ 4 files changed, 38 insertions(+) create mode 100644 app/services/deploy_keys/create_service.rb create mode 100644 app/services/gpg_keys/create_service.rb create mode 100644 app/services/keys/base_service.rb create mode 100644 app/services/keys/create_service.rb (limited to 'app/services') diff --git a/app/services/deploy_keys/create_service.rb b/app/services/deploy_keys/create_service.rb new file mode 100644 index 00000000000..16de3d08df2 --- /dev/null +++ b/app/services/deploy_keys/create_service.rb @@ -0,0 +1,7 @@ +module DeployKeys + class CreateService < Keys::BaseService + def execute + DeployKey.create(params.merge(user: user)) + end + end +end diff --git a/app/services/gpg_keys/create_service.rb b/app/services/gpg_keys/create_service.rb new file mode 100644 index 00000000000..e822a89c4d3 --- /dev/null +++ b/app/services/gpg_keys/create_service.rb @@ -0,0 +1,9 @@ +module GpgKeys + class CreateService < Keys::BaseService + def execute + key = user.gpg_keys.create(params) + notification_service.new_gpg_key(key) if key.persisted? + key + end + end +end diff --git a/app/services/keys/base_service.rb b/app/services/keys/base_service.rb new file mode 100644 index 00000000000..545832d0bd4 --- /dev/null +++ b/app/services/keys/base_service.rb @@ -0,0 +1,13 @@ +module Keys + class BaseService + attr_accessor :user, :params + + def initialize(user, params) + @user, @params = user, params + end + + def notification_service + NotificationService.new + end + end +end diff --git a/app/services/keys/create_service.rb b/app/services/keys/create_service.rb new file mode 100644 index 00000000000..e2e5a6c46c5 --- /dev/null +++ b/app/services/keys/create_service.rb @@ -0,0 +1,9 @@ +module Keys + class CreateService < ::Keys::BaseService + def execute + key = user.keys.create(params) + notification_service.new_key(key) if key.persisted? + key + end + end +end -- cgit v1.2.1