diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2016-09-21 14:02:10 +0200 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2016-09-22 11:07:39 +0200 |
| commit | 8e4b849974b79e3571d91bd91cecacc09747a7a0 (patch) | |
| tree | d8a558f680152f7f0d3dc69d58851672b87112b6 | |
| parent | 98b3d6ce695a9751f72adc35bc09f82eb2f624a4 (diff) | |
| download | gitlab-ce-8e4b849974b79e3571d91bd91cecacc09747a7a0.tar.gz | |
Remove colons in dropdowns, use icon helper, and fix 'Show original' link.
(Also removes duplicate changelog entry.)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_versions.html.haml | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/CHANGELOG b/CHANGELOG index 6e9567e7e20..248ec6faae3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -175,7 +175,6 @@ v 8.12.0 (unreleased) - Fix Gitlab::Popen.popen thread-safety issue - Add specs to removing project (Katarzyna Kobierska Ula Budziszewska) - Clean environment variables when running git hooks - - Add UX improvements for merge request version diffs - Fix Import/Export issues importing protected branches and some specific models - Fix non-master branch readme display in tree view - Add UX improvements for merge request version diffs diff --git a/app/views/projects/merge_requests/show/_versions.html.haml b/app/views/projects/merge_requests/show/_versions.html.haml index 8f7b5d1543e..33e56d5417f 100644 --- a/app/views/projects/merge_requests/show/_versions.html.haml +++ b/app/views/projects/merge_requests/show/_versions.html.haml @@ -12,9 +12,9 @@ %span.caret %ul.dropdown-menu.dropdown-menu-selectable .dropdown-title - %span Version: + %span Version %button.dropdown-title-button.dropdown-menu-close - %i.fa.fa-times.dropdown-menu-close-icon + = icon('times', class: 'dropdown-menu-close-icon') - @merge_request_diffs.each do |merge_request_diff| %li = link_to merge_request_version_path(@project, @merge_request, merge_request_diff), class: ('is-active' if merge_request_diff == @merge_request_diff) do @@ -40,9 +40,9 @@ %span.caret %ul.dropdown-menu.dropdown-menu-selectable .dropdown-title - %span Compared with: + %span Compared with %button.dropdown-title-button.dropdown-menu-close - %i.fa.fa-times.dropdown-menu-close-icon + = icon('times', class: 'dropdown-menu-close-icon') - @comparable_diffs.each do |merge_request_diff| %li = link_to merge_request_version_path(@project, @merge_request, @merge_request_diff, merge_request_diff.head_commit_sha), class: ('is-active' if merge_request_diff == @start_version) do @@ -67,4 +67,4 @@ Comments are disabled because you're comparing two versions of this merge request. - else Comments are disabled because you're viewing an old version of this merge request. - = link_to 'Show latest version', merge_request_version_path(@project, @merge_request, @merge_request_diff), class: 'btn btn-sm' + = link_to 'Show latest version', diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn btn-sm' |