diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-10 18:52:33 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-10 18:52:33 +0000 |
| commit | 5c1dba671dbfbd8a20b014b5548cc07ce5641e9b (patch) | |
| tree | 35e28f0f364909376567b74bce94dbe152c537fe | |
| parent | e1f9f69cb2832e710f3e76dd562761496688d982 (diff) | |
| parent | 145143ac7fd0ecd9d94d2f0bd9cc48426d5ac829 (diff) | |
| download | gitlab-ce-5c1dba671dbfbd8a20b014b5548cc07ce5641e9b.tar.gz | |
Merge branch 'issue-mr-build-status-placement' into 'master'
Moves build status tooltip on issues
See merge request !3156
| -rw-r--r-- | app/helpers/ci_status_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/projects/issues/_merge_requests.html.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb index d8bee21c82e..f20779f2fbb 100644 --- a/app/helpers/ci_status_helper.rb +++ b/app/helpers/ci_status_helper.rb @@ -42,12 +42,12 @@ module CiStatusHelper icon(icon_name + ' fw') end - def render_ci_status(ci_commit) + def render_ci_status(ci_commit, tooltip_placement: 'auto left') link_to ci_status_icon(ci_commit), ci_status_path(ci_commit), class: "ci-status-link ci-status-icon-#{ci_commit.status.dasherize}", title: "Build #{ci_status_label(ci_commit)}", - data: { toggle: 'tooltip', placement: 'left' } + data: { toggle: 'tooltip', placement: tooltip_placement } end def no_runners_for_project?(project) diff --git a/app/views/projects/issues/_merge_requests.html.haml b/app/views/projects/issues/_merge_requests.html.haml index 640a1962ffc..d9868ad1f0a 100644 --- a/app/views/projects/issues/_merge_requests.html.haml +++ b/app/views/projects/issues/_merge_requests.html.haml @@ -11,7 +11,7 @@ - elsif has_any_ci = icon('blank fw') %span.merge-request-id - \!#{merge_request.iid} + = merge_request.to_reference %span.merge-request-info %strong = link_to_gfm merge_request.title, merge_request_path(merge_request), class: "row_title" |