diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-24 16:48:54 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-24 16:48:54 -0500 |
| commit | cbbe6d5d55037ad62bf23e0fc40fd982d09e4100 (patch) | |
| tree | 48ae6d03524197bfa856b7de2434fd9b190fb003 /app/views/projects | |
| parent | 644246dae48889a7009cbab4d15783a301b7a269 (diff) | |
| parent | ba58a66a55e2270eb46f7429e070d16f77d25b9d (diff) | |
| download | gitlab-ce-cbbe6d5d55037ad62bf23e0fc40fd982d09e4100.tar.gz | |
Merge branch 'master' into bootstrap4
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/commit/branches.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_how_to_merge.html.haml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/views/projects/commit/branches.html.haml b/app/views/projects/commit/branches.html.haml index ad9b6962502..a91e31afc2b 100644 --- a/app/views/projects/commit/branches.html.haml +++ b/app/views/projects/commit/branches.html.haml @@ -6,7 +6,8 @@ - if @branches.any? || @tags.any? || @tags_limit_exceeded %span - = link_to "…", "#", class: "js-details-expand label badge-gray" + = link_to "#", class: "js-details-expand label label-gray ref-name" do + = sprite_icon('ellipsis_h', size: 12, css_class: 'vertical-align-middle') %span.js-details-content.hide = commit_branches_links(@project, @branches) - if @tags_limit_exceeded diff --git a/app/views/projects/merge_requests/_how_to_merge.html.haml b/app/views/projects/merge_requests/_how_to_merge.html.haml index 36b87a8d305..5353fa8a88f 100644 --- a/app/views/projects/merge_requests/_how_to_merge.html.haml +++ b/app/views/projects/merge_requests/_how_to_merge.html.haml @@ -1,4 +1,4 @@ -#modal_merge_info.modal +#modal_merge_info.modal{ tabindex: '-1' } .modal-dialog .modal-content .modal-header |