diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 22:34:03 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 22:34:03 +0100 |
commit | 8fb49a4b7005d7e57bb84d6fe5db97ff39d1064b (patch) | |
tree | 38118628101e0b9281a07c295d15d0c9f075197b /app/models/ci | |
parent | f39ff54290abe224b0b79accc0da48c1cd2d2109 (diff) | |
parent | e616739e2fae12e5358d2cea40089a51468d9b4a (diff) | |
download | gitlab-ce-8fb49a4b7005d7e57bb84d6fe5db97ff39d1064b.tar.gz |
Merge branch 'master' into merge-if-green
# Conflicts:
# app/views/projects/merge_requests/widget/_heading.html.haml
# app/views/projects/merge_requests/widget/open/_accept.html.haml
Diffstat (limited to 'app/models/ci')
-rw-r--r-- | app/models/ci/commit.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/commit.rb b/app/models/ci/commit.rb index 0f74a7f0688..75465685e98 100644 --- a/app/models/ci/commit.rb +++ b/app/models/ci/commit.rb @@ -207,7 +207,7 @@ module Ci end def ci_yaml_file - gl_project.repository.blob_at(sha, '.gitlab-ci.yml').data + @ci_yaml_file ||= gl_project.repository.blob_at(sha, '.gitlab-ci.yml').data rescue nil end |