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
15a4a7d5
Commit
15a4a7d5
authored
Mar 28, 2017
by
Annabel Dunstone Gray
Committed by
Jose Ivan Vargas
Apr 07, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update approval input using checkbox
parent
060fd0a5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
app/assets/javascripts/users_select.js
app/assets/javascripts/users_select.js
+5
-0
app/views/projects/ee/_merge_request_settings.html.haml
app/views/projects/ee/_merge_request_settings.html.haml
+3
-4
No files found.
app/assets/javascripts/users_select.js
View file @
15a4a7d5
...
@@ -366,6 +366,11 @@ import Vue from 'vue';
...
@@ -366,6 +366,11 @@ import Vue from 'vue';
});
});
};
};
})(
this
));
})(
this
));
$
(
'
#require_approvals
'
).
on
(
'
change
'
,
(
e
)
=>
{
var
$approvalInput
=
$
(
'
#project_approvals_before_merge
'
);
$approvalInput
.
val
(
$
(
'
#require_approvals
'
).
prop
(
"
checked
"
)
?
1
:
0
);
});
}
}
UsersSelect
.
prototype
.
initSelection
=
function
(
element
,
callback
)
{
UsersSelect
.
prototype
.
initSelection
=
function
(
element
,
callback
)
{
...
...
app/views/projects/ee/_merge_request_settings.html.haml
View file @
15a4a7d5
...
@@ -45,8 +45,8 @@
...
@@ -45,8 +45,8 @@
.form-group.reset-approvals-on-push
.form-group.reset-approvals-on-push
.checkbox
.checkbox
=
form
.
label
:approvals_before_merge
do
=
label_tag
:require_approvals
do
=
form
.
check_box
:approvals_before_merge
=
check_box_tag
:require_approvals
%strong
Activate merge request approvals
%strong
Activate merge request approvals
//TODO: correct help path
//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'
),
"https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html#merge-request-approvals"
,
target:
'_blank'
...
@@ -91,9 +91,8 @@
...
@@ -91,9 +91,8 @@
.form-group
.form-group
=
form
.
label
:approvals_before_merge
,
class:
'label-light'
do
=
form
.
label
:approvals_before_merge
,
class:
'label-light'
do
Approvals required
Approvals required
=
form
.
number_field
:approvals_before_merge
,
class:
"form-control"
=
form
.
number_field
:approvals_before_merge
,
class:
"form-control"
,
min:
0
.help-block
.help-block
NUMBER approvals are required, from the above list you specified
.form-group.reset-approvals-on-push
.form-group.reset-approvals-on-push
.checkbox
.checkbox
...
...
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