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
f3833e13
Commit
f3833e13
authored
Mar 30, 2017
by
Simon Knox
Committed by
Jose Ivan Vargas
Apr 07, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix help url, use buttons for form submit
parent
f6bd3cb9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
app/views/projects/ee/_merge_request_settings.html.haml
app/views/projects/ee/_merge_request_settings.html.haml
+5
-5
No files found.
app/views/projects/ee/_merge_request_settings.html.haml
View file @
f3833e13
...
...
@@ -48,8 +48,7 @@
=
label_tag
:require_approvals
do
=
check_box_tag
:require_approvals
,
nil
,
project
.
approvals_before_merge
>
0
%strong
Activate merge request approvals
//TODO: correct help path
=
link_to
icon
(
'question-circle'
),
"https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html#merge-request-approvals"
,
target:
'_blank'
=
link_to
icon
(
'question-circle'
),
help_page_path
(
"user/project/merge_requests/merge_request_approvals"
),
target:
'_blank'
.descr
Merge request approvals allow you to set the number of necessary approvals and predefine a list of approvers that you will need to approve every merge request in a project.
.nested-settings
...
...
@@ -58,8 +57,8 @@
Approvers
.input-group.input-btn-group
=
users_select_tag
(
"project[approver_ids]"
,
multiple:
true
,
class:
'input-large'
,
scope: :all
,
email_user:
true
)
//TODO obviously shouldn't be root_path
=
link_to
"Add"
,
root_path
,
class:
"btn btn-success"
,
title:
'Add approver(s)'
%button
.btn.btn-success
{
type:
'submit'
,
title:
'Add approver(s)'
}
Add
.help-block
Add an approver suggestion for each merge request
...
...
@@ -68,7 +67,8 @@
.input-group.input-btn-group
-
skip_groups
=
project
.
approver_groups
.
pluck
(
:group_id
)
=
groups_select_tag
(
'project[approver_group_ids]'
,
multiple:
true
,
data:
{
skip_groups:
skip_groups
,
all_available:
true
},
class:
'input-large'
)
=
link_to
"Add"
,
root_path
,
class:
"btn btn-success"
,
title:
'Add group(s)'
%button
.btn.btn-success
{
type:
'submit'
,
title:
'Add group(s)'
}
Add
.help-block
Add a group as an approver suggestion for each merge request
...
...
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