diff options
Diffstat (limited to 'app/services/ci')
| -rw-r--r-- | app/services/ci/create_builds_service.rb | 4 | ||||
| -rw-r--r-- | app/services/ci/create_commit_service.rb | 16 |
2 files changed, 4 insertions, 16 deletions
diff --git a/app/services/ci/create_builds_service.rb b/app/services/ci/create_builds_service.rb index e9c85410e5c..77a4305071c 100644 --- a/app/services/ci/create_builds_service.rb +++ b/app/services/ci/create_builds_service.rb @@ -1,6 +1,6 @@ module Ci class CreateBuildsService - def execute(commit, ref, tag, push_data, config_processor, trigger_request) + def execute(commit, ref, tag, user, config_processor, trigger_request) config_processor.stages.any? do |stage| builds_attrs = config_processor.builds_for_stage_and_ref(stage, ref, tag) builds_attrs.map do |build_attrs| @@ -17,7 +17,7 @@ module Ci trigger_request: trigger_request, ref: ref, tag: tag, - push_data: push_data, + user: user, }) end end diff --git a/app/services/ci/create_commit_service.rb b/app/services/ci/create_commit_service.rb index 9120a82edcd..edbb07580c9 100644 --- a/app/services/ci/create_commit_service.rb +++ b/app/services/ci/create_commit_service.rb @@ -1,6 +1,6 @@ module Ci class CreateCommitService - def execute(project, params) + def execute(project, params, user) before_sha = params[:before] sha = params[:checkout_sha] || params[:after] origin_ref = params[:ref] @@ -17,21 +17,9 @@ module Ci end tag = origin_ref.start_with?('refs/tags/') - push_data = { - before: before_sha, - after: sha, - ref: ref, - user_name: params[:user_name], - user_email: params[:user_email], - repository: params[:repository], - commits: params[:commits], - total_commits_count: params[:total_commits_count], - ci_yaml_file: params[:ci_yaml_file] - } - commit = project.gl_project.ensure_ci_commit(sha) commit.update_committed! - commit.create_builds(ref, tag, push_data) + commit.create_builds(ref, tag, user) commit end |