Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
8e4b8499
Commit
8e4b8499
authored
Sep 21, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove colons in dropdowns, use icon helper, and fix 'Show original' link.
(Also removes duplicate changelog entry.)
parent
98b3d6ce
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
CHANGELOG
CHANGELOG
+0
-1
app/views/projects/merge_requests/show/_versions.html.haml
app/views/projects/merge_requests/show/_versions.html.haml
+5
-5
No files found.
CHANGELOG
View file @
8e4b8499
...
...
@@ -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
...
...
app/views/projects/merge_requests/show/_versions.html.haml
View file @
8e4b8499
...
...
@@ -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'
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment