diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/ci/build.rb | 4 | ||||
| -rw-r--r-- | app/services/ci/create_trigger_request_service.rb | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 30a8b5aa816..89af83d8efc 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -146,6 +146,10 @@ module Ci delegate :sha, :short_sha, :project, to: :commit, prefix: false + def before_sha + Gitlab::Git::BLANK_SHA + end + def trace_html html = Ci::Ansi2html::convert(trace) if trace.present? html || '' diff --git a/app/services/ci/create_trigger_request_service.rb b/app/services/ci/create_trigger_request_service.rb index 3597372528b..083cea77202 100644 --- a/app/services/ci/create_trigger_request_service.rb +++ b/app/services/ci/create_trigger_request_service.rb @@ -1,10 +1,11 @@ module Ci class CreateTriggerRequestService def execute(project, trigger, ref, variables = nil) - target = project.gl_project.repository.rev_parse_target(ref) - return unless target + return unless project.gl_project + return unless project.gl_project.repository # 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) @@ -16,6 +17,8 @@ module Ci if ci_commit.create_builds(ref, tag, nil, trigger_request) trigger_request end + rescue Rugged::OdbError + nil end end end |