BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
283f9633
Commit
283f9633
authored
Sep 21, 2016
by
tauriedavis
Committed by
Fatih Acet
Sep 22, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix dropdowns for mr-versions
parent
a41df736
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
38 additions
and
34 deletions
+38
-34
_versions.html.haml
app/views/projects/merge_requests/show/_versions.html.haml
+38
-34
No files found.
app/views/projects/merge_requests/show/_versions.html.haml
View file @
283f9633
...
...
@@ -10,23 +10,25 @@
-
else
version
#{
version_index
(
@merge_request_diff
)
}
%span
.caret
%ul
.dropdown-menu
.dropdown-menu-selectable
.dropdown-menu.dropdown-select
.dropdown-menu-selectable
.dropdown-title
%span
Version
%button
.dropdown-title-button.dropdown-menu-close
%span
Version
:
%button
.dropdown-title-button.dropdown-menu-close
{
aria:
{
label:
"Close"
}}
=
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
%strong
-
if
merge_request_diff
.
latest?
latest version
-
else
version
#{
version_index
(
merge_request_diff
)
}
.monospace
#{
short_sha
(
merge_request_diff
.
head_commit_sha
)
}
%small
#{
number_with_delimiter
(
merge_request_diff
.
commits
.
count
)
}
#{
'commit'
.
pluralize
(
merge_request_diff
.
commits
.
count
)
}
,
=
time_ago_with_tooltip
(
merge_request_diff
.
created_at
)
.dropdown-content
%ul
-
@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
%strong
-
if
merge_request_diff
.
latest?
latest version
-
else
version
#{
version_index
(
merge_request_diff
)
}
.monospace
#{
short_sha
(
merge_request_diff
.
head_commit_sha
)
}
%small
#{
number_with_delimiter
(
merge_request_diff
.
commits
.
count
)
}
#{
'commit'
.
pluralize
(
merge_request_diff
.
commits
.
count
)
}
,
=
time_ago_with_tooltip
(
merge_request_diff
.
created_at
)
-
if
@merge_request_diff
.
base_commit_sha
and
...
...
@@ -38,27 +40,29 @@
-
else
#{
@merge_request
.
target_branch
}
%span
.caret
%ul
.dropdown-menu
.dropdown-menu-selectable
.dropdown-menu.dropdown-select
.dropdown-menu-selectable
.dropdown-title
%span
Compared with
%button
.dropdown-title-button.dropdown-menu-close
%span
Compared with
:
%button
.dropdown-title-button.dropdown-menu-close
{
aria:
{
label:
"Close"
}}
=
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
%strong
-
if
merge_request_diff
.
latest?
latest version
-
else
version
#{
version_index
(
merge_request_diff
)
}
.monospace
#{
short_sha
(
merge_request_diff
.
head_commit_sha
)
}
%small
=
time_ago_with_tooltip
(
merge_request_diff
.
created_at
)
%li
=
link_to
merge_request_version_path
(
@project
,
@merge_request
,
@merge_request_diff
),
class:
(
'is-active'
unless
@start_sha
)
do
%strong
#{
@merge_request
.
target_branch
}
(base)
.monospace
#{
short_sha
(
@merge_request_diff
.
base_commit_sha
)
}
.dropdown-content
%ul
-
@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
%strong
-
if
merge_request_diff
.
latest?
latest version
-
else
version
#{
version_index
(
merge_request_diff
)
}
.monospace
#{
short_sha
(
merge_request_diff
.
head_commit_sha
)
}
%small
=
time_ago_with_tooltip
(
merge_request_diff
.
created_at
)
%li
=
link_to
merge_request_version_path
(
@project
,
@merge_request
,
@merge_request_diff
),
class:
(
'is-active'
unless
@start_sha
)
do
%strong
#{
@merge_request
.
target_branch
}
(base)
.monospace
#{
short_sha
(
@merge_request_diff
.
base_commit_sha
)
}
-
unless
@merge_request_diff
.
latest?
&&
!
@start_sha
.comments-disabled-notif.content-block
...
...
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