diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project_services/gitlab_ci_service.rb | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/app/models/project_services/gitlab_ci_service.rb b/app/models/project_services/gitlab_ci_service.rb index a9354754686..19b5859d5c9 100644 --- a/app/models/project_services/gitlab_ci_service.rb +++ b/app/models/project_services/gitlab_ci_service.rb @@ -40,10 +40,14 @@ class GitlabCiService < CiService def execute(data) return unless supported_events.include?(data[:object_kind]) - ci_yaml_file = ci_yaml_file(data) + sha = data[:checkout_sha] - if ci_yaml_file - data.merge!(ci_yaml_file: ci_yaml_file) + if sha.present? + file = ci_yaml_file(sha) + + if file && file.data + data.merge!(ci_yaml_file: file.data) + end end service_hook.execute(data) @@ -129,15 +133,15 @@ class GitlabCiService < CiService private - def ci_yaml_file(data) - ref = data[:checkout_sha] - repo = project.repository - commit = repo.commit(ref) - blob = Gitlab::Git::Blob.find(repo, commit.id, ".gitlab-ci.yml") - blob && blob.data + def ci_yaml_file(sha) + repository.blob_at(sha, '.gitlab-ci.yml') end def fork_registration_path project_url.sub(/projects\/\d*/, "#{API_PREFIX}/forks") end + + def repository + project.repository + end end |