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
38bac5d7
Unverified
Commit
38bac5d7
authored
Jun 01, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show avatars in merge widget and fix mr download button overflow
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
9c6f6a19
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
11 deletions
+10
-11
_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+8
-9
_state_widget.html.haml
...iews/projects/merge_requests/show/_state_widget.html.haml
+2
-2
No files found.
app/views/projects/merge_requests/_show.html.haml
View file @
38bac5d7
...
...
@@ -22,15 +22,14 @@
%span
into
%strong
.label-branch
#{
@merge_request
.
target_branch
}
-
if
@merge_request
.
open?
%span
.pull-right
.btn-group
%a
.btn.dropdown-toggle
{
data:
{
toggle: :dropdown
}
}
=
icon
(
'download'
)
Download
as
%span
.caret
%ul
.dropdown-menu
%li
=
link_to
"Email Patches"
,
merge_request_path
(
@merge_request
,
format: :patch
)
%li
=
link_to
"Plain Diff"
,
merge_request_path
(
@merge_request
,
format: :diff
)
.btn-group.btn-group-sm.pull-right
%a
.btn.btn-sm.dropdown-toggle
{
data:
{
toggle: :dropdown
}
}
=
icon
(
'download'
)
Download
as
%span
.caret
%ul
.dropdown-menu
%li
=
link_to
"Email Patches"
,
merge_request_path
(
@merge_request
,
format: :patch
)
%li
=
link_to
"Plain Diff"
,
merge_request_path
(
@merge_request
,
format: :diff
)
=
render
"projects/merge_requests/show/how_to_merge"
=
render
"projects/merge_requests/show/state_widget"
...
...
app/views/projects/merge_requests/show/_state_widget.html.haml
View file @
38bac5d7
...
...
@@ -13,7 +13,7 @@
%h4
Rejected
-
if
@merge_request
.
closed_event
by
#{
link_to_member
(
@project
,
@merge_request
.
closed_event
.
author
,
avatar:
fals
e
)
}
by
#{
link_to_member
(
@project
,
@merge_request
.
closed_event
.
author
,
avatar:
tru
e
)
}
#{
time_ago_with_tooltip
(
@merge_request
.
closed_event
.
created_at
)
}
%p
Changes were not merged into target branch
...
...
@@ -21,7 +21,7 @@
%h4
Accepted
-
if
@merge_request
.
merge_event
by
#{
link_to_member
(
@project
,
@merge_request
.
merge_event
.
author
,
avatar:
fals
e
)
}
by
#{
link_to_member
(
@project
,
@merge_request
.
merge_event
.
author
,
avatar:
tru
e
)
}
#{
time_ago_with_tooltip
(
@merge_request
.
merge_event
.
created_at
)
}
=
render
"projects/merge_requests/show/remove_source_branch"
...
...
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