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
a4ab6ffd
Commit
a4ab6ffd
authored
Jun 12, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace `can be merged` with `can be accepted`
parent
07703c22
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
9 deletions
+8
-9
app/views/projects/merge_requests/widget/open/_approve.html.haml
...ws/projects/merge_requests/widget/open/_approve.html.haml
+8
-9
No files found.
app/views/projects/merge_requests/widget/open/_approve.html.haml
View file @
a4ab6ffd
%div
%h4
Requires
#{
pluralize
(
@merge_request
.
approvals_left
,
'approval'
)
}
%p
Each merge request in this project must be approved by
#{
pluralize
(
@merge_request
.
approvals_required
,
'user'
)
}
before it can be merged
-
unless
@merge_request
.
approved_by?
(
current_user
)
.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-primary approve-btn"
%div
%h4
Requires
#{
pluralize
(
@merge_request
.
approvals_left
,
'approval'
)
}
%p
Each merge request in this project must be approved by
#{
pluralize
(
@merge_request
.
approvals_required
,
'user'
)
}
before it can be accepted
-
unless
@merge_request
.
approved_by?
(
current_user
)
.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-primary approve-btn"
\ No newline at end of file
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