diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-10 18:05:41 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-10 18:05:55 +0000 |
| commit | 145143ac7fd0ecd9d94d2f0bd9cc48426d5ac829 (patch) | |
| tree | a7ea0d03eaa8f4b9e5ebb3085b2d8f3cb0532f59 | |
| parent | bc19acab2543f959a1fca4c83faf5c1975b7bb90 (diff) | |
| download | gitlab-ce-145143ac7fd0ecd9d94d2f0bd9cc48426d5ac829.tar.gz | |
Changed named argument
Set position to auto left so that if it is off-screen it goes to the right
| -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 10456189e21..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, placement: 'left') + 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: placement } + 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 3eb0926b746..d9868ad1f0a 100644 --- a/app/views/projects/issues/_merge_requests.html.haml +++ b/app/views/projects/issues/_merge_requests.html.haml @@ -7,7 +7,7 @@ %li %span.merge-request-ci-status - if merge_request.ci_commit - = render_ci_status(merge_request.ci_commit, placement: 'bottom') + = render_ci_status(merge_request.ci_commit) - elsif has_any_ci = icon('blank fw') %span.merge-request-id |