diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 22:26:29 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 22:26:29 +0100 |
| commit | 6c94a44295eec5efff87102fecffc2ac03ee560d (patch) | |
| tree | 5206e11ab9e08f1910256af3693654912170602b /app/models/ci/commit.rb | |
| parent | 5beacba038c097e513b46f24ee26d5065ad419c9 (diff) | |
| parent | e616739e2fae12e5358d2cea40089a51468d9b4a (diff) | |
| download | gitlab-ce-6c94a44295eec5efff87102fecffc2ac03ee560d.tar.gz | |
Merge branch 'master' into mr-builds
# Conflicts:
# app/controllers/projects/merge_requests_controller.rb
# app/views/projects/merge_requests/widget/_heading.html.haml
Diffstat (limited to 'app/models/ci/commit.rb')
| -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 971e899de84..cb90b0de63d 100644 --- a/app/models/ci/commit.rb +++ b/app/models/ci/commit.rb @@ -199,7 +199,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 |