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
9322e524
Commit
9322e524
authored
Jun 11, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Always show approvers list
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
747f6655
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
9 deletions
+6
-9
app/views/projects/merge_requests/show/_approve.html.haml
app/views/projects/merge_requests/show/_approve.html.haml
+1
-9
app/views/projects/merge_requests/show/_mr_accept.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
+5
-0
No files found.
app/views/projects/merge_requests/show/_approve.html.haml
View file @
9322e524
.clearfix
-
unless
@merge_request
.
approved_by?
(
current_user
)
.
pull-left
.
append-bottom-10
=
form_for
[
:approve
,
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@merge_request
],
method: :post
do
|
f
|
=
f
.
submit
"Approve Merge Request"
,
class:
"btn btn-reopen approve-btn"
-
if
@merge_request
.
approvals
.
any?
.pull-left.approved-by-users
Approved by
-
@merge_request
.
approved_by_users
.
each
do
|
user
|
=
link_to_member
(
@project
,
user
,
name:
false
,
size:
24
)
%br
%p
This merge request must be approved by
#{
pluralize
(
@merge_request
.
approvals_required
,
'user'
)
}
before it can be merged
app/views/projects/merge_requests/show/_mr_accept.html.haml
View file @
9322e524
...
...
@@ -49,6 +49,11 @@
%strong
=
link_to
"command line"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
-
if
@merge_request
.
approvals
.
any?
.approved-by-users
Approved by
-
@merge_request
.
approved_by_users
.
each
do
|
user
|
=
link_to_member
(
@project
,
user
,
name:
false
,
size:
24
)
.automerge_widget.no_satellite.hide
%p
...
...
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