diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 12:08:49 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 12:08:49 +0000 |
| commit | 1308dc5eb484ab0f8064989fc551ebdb4b1a7976 (patch) | |
| tree | 614a93d9bf8df34ecfc25c02648329987fb21dde /app/presenters | |
| parent | f0707f413ce49b5712fca236b950acbec029be1e (diff) | |
| download | gitlab-ce-1308dc5eb484ab0f8064989fc551ebdb4b1a7976.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/presenters')
| -rw-r--r-- | app/presenters/ci/pipeline_presenter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/presenters/ci/pipeline_presenter.rb b/app/presenters/ci/pipeline_presenter.rb index b113c7043e7..37abefb5664 100644 --- a/app/presenters/ci/pipeline_presenter.rb +++ b/app/presenters/ci/pipeline_presenter.rb @@ -116,7 +116,7 @@ module Ci def merge_request_presenter strong_memoize(:merge_request_presenter) do - if pipeline.triggered_by_merge_request? + if pipeline.merge_request? pipeline.merge_request.present(current_user: current_user) end end |