diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-06 09:16:40 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-06 09:16:40 +0000 |
| commit | 2bf8345542dbdae17c3755ca7157cbaf70ffde41 (patch) | |
| tree | 48b9b82e6ae9ed2e12649b4ea4f95b6833948d3a /app/models/commit.rb | |
| parent | 99edc15127d9d23475c94079d53e2893f58c042a (diff) | |
| parent | 20e9b32c96a5b08e3f61c8974b43977f98d8666e (diff) | |
| download | gitlab-ce-2bf8345542dbdae17c3755ca7157cbaf70ffde41.tar.gz | |
Merge branch 'master' into '42568-pipeline-empty-state'
# Conflicts:
# app/views/projects/jobs/show.html.haml
# lib/gitlab/ci/status/core.rb
Diffstat (limited to 'app/models/commit.rb')
| -rw-r--r-- | app/models/commit.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index b64462fb768..3f7f36e83c0 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -32,7 +32,8 @@ class Commit COMMIT_SHA_PATTERN = /\h{#{MIN_SHA_LENGTH},40}/.freeze def banzai_render_context(field) - context = { pipeline: :single_line, project: self.project } + pipeline = field == :description ? :commit_description : :single_line + context = { pipeline: pipeline, project: self.project } context[:author] = self.author if self.author context |