diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-30 12:08:55 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-30 12:08:55 +0300 |
| commit | be37a0ee5e3e3dbb967266248f0f46f14a9931e2 (patch) | |
| tree | 8fd575a36933fb847a6f92ff76d9c1ad908a3f7b /app/views/projects/pipelines | |
| parent | 6305f1dc00870f6e0635e2e850538a00bbd00bda (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/pipelines')
| -rw-r--r-- | app/views/projects/pipelines/_info.html.haml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml index ce6ae765de9..85902d51ab0 100644 --- a/app/views/projects/pipelines/_info.html.haml +++ b/app/views/projects/pipelines/_info.html.haml @@ -69,4 +69,11 @@ .icon-container = sprite_icon("git-merge") %span.related-merge-requests - = @pipeline.all_related_merge_request_text + %span.js-truncated-mr-list + = @pipeline.all_related_merge_request_text(limit: 1) + - if @pipeline.has_many_merge_requests? + = link_to("#", class: "js-toggle-mr-list") do + %span.text-expander + = sprite_icon('ellipsis_h', size: 12) + %span.js-full-mr-list.hide + = @pipeline.all_related_merge_request_text |