Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

1 files changed, 14 insertions, 0 deletions

diff --git a/app/models/project_services/gitlab_ci_service.rb b/app/models/project_services/gitlab_ci_service.rb
index 949a4d7111b..a9354754686 100644
--- a/app/models/project_services/gitlab_ci_service.rb
+++ b/app/models/project_services/gitlab_ci_service.rb
@@ -40,6 +40,12 @@ class GitlabCiService < CiService
   def execute(data)
     return unless supported_events.include?(data[:object_kind])
 
+    ci_yaml_file = ci_yaml_file(data)
+
+    if ci_yaml_file
+      data.merge!(ci_yaml_file: ci_yaml_file)
+    end
+
     service_hook.execute(data)
   end
 
@@ -123,6 +129,14 @@ 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
+  end
+
   def fork_registration_path
     project_url.sub(/projects\/\d*/, "#{API_PREFIX}/forks")
   end