diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/ci/create_trigger_request_service.rb | 13 | ||||
| -rw-r--r-- | app/services/ci/web_hook_service.rb | 1 |
2 files changed, 6 insertions, 8 deletions
diff --git a/app/services/ci/create_trigger_request_service.rb b/app/services/ci/create_trigger_request_service.rb index 083cea77202..ea82dbb2bf4 100644 --- a/app/services/ci/create_trigger_request_service.rb +++ b/app/services/ci/create_trigger_request_service.rb @@ -1,15 +1,14 @@ module Ci class CreateTriggerRequestService def execute(project, trigger, ref, variables = nil) - return unless project.gl_project - return unless project.gl_project.repository + commit = project.gl_project.commit(ref) + return unless commit # check if ref is tag - target = project.gl_project.repository.rev_parse_target(ref) - sha = target.oid - tag = target.is_a?(Rugged::Tag) || target.is_a?(Rugged::Tag::Annotation) + tag = project.gl_project.repository.find_tag(ref).present? + + ci_commit = project.gl_project.ensure_ci_commit(commit.sha) - ci_commit = project.gl_project.ensure_ci_commit(sha) trigger_request = trigger.trigger_requests.create!( variables: variables ) @@ -17,8 +16,6 @@ module Ci if ci_commit.create_builds(ref, tag, nil, trigger_request) trigger_request end - rescue Rugged::OdbError - nil end end end diff --git a/app/services/ci/web_hook_service.rb b/app/services/ci/web_hook_service.rb index 4bbca5c7da1..92e6df442b4 100644 --- a/app/services/ci/web_hook_service.rb +++ b/app/services/ci/web_hook_service.rb @@ -27,6 +27,7 @@ module Ci project_name: project.name, gitlab_url: project.gitlab_url, ref: build.ref, + before_sha: build.before_sha, sha: build.sha, }) end |