diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-01 09:10:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-01 09:10:47 +0300 |
| commit | 21543f57d625a70c3884d1915fa14ad340d01edc (patch) | |
| tree | 4ef599f32345507febcd563a5a7a0f2bb06dcd14 /app/presenters | |
| parent | 46c89ffafef24d59ac7ccd56e30cf2b5c7bf5d77 (diff) | |
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 0c68c33cbbe..4e955469ddf 100644 --- a/app/presenters/ci/pipeline_presenter.rb +++ b/app/presenters/ci/pipeline_presenter.rb @@ -61,7 +61,7 @@ module Ci link_to_merge_request: link_to_merge_request, link_to_merge_request_source_branch: link_to_merge_request_source_branch } - elsif pipeline.merge_request_pipeline? + elsif pipeline.merged_result_pipeline? _("for %{link_to_merge_request} with %{link_to_merge_request_source_branch} into %{link_to_merge_request_target_branch}") .html_safe % { link_to_merge_request: link_to_merge_request, |