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
57f85b8b
Commit
57f85b8b
authored
May 30, 2019
by
Paul Slaughter
Committed by
Mark Chao
Jun 04, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FE: Remove redundant partial views for approvals
parent
8c6b936b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
19 deletions
+17
-19
ee/app/views/projects/_merge_request_approvals_settings_form.html.haml
...projects/_merge_request_approvals_settings_form.html.haml
+10
-1
ee/app/views/shared/issuable/_approvals.html.haml
ee/app/views/shared/issuable/_approvals.html.haml
+7
-1
ee/app/views/shared/issuable/_approvals_multiple_rule.html.haml
.../views/shared/issuable/_approvals_multiple_rule.html.haml
+0
-7
ee/app/views/shared/merge_request_approvals_settings/_multiple_rules_form.html.haml
...request_approvals_settings/_multiple_rules_form.html.haml
+0
-10
No files found.
ee/app/views/projects/_merge_request_approvals_settings_form.html.haml
View file @
57f85b8b
-
can_override_approvers
=
project
.
can_override_approvers?
=
render
'shared/merge_request_approvals_settings/multiple_rules_form'
,
form:
form
,
project:
project
.form-group
=
form
.
label
:approver_ids
,
class:
'label-bold'
do
=
_
(
"Add approvers"
)
#js-mr-approvals-settings
{
data:
{
'project_id'
:
@project
.
id
,
'project_path'
:
expose_path
(
api_v4_projects_path
(
id:
@project
.
id
)),
'settings_path'
:
expose_path
(
api_v4_projects_approval_settings_path
(
id:
@project
.
id
)),
'rules_path'
:
expose_path
(
api_v4_projects_approval_settings_rules_path
(
id:
@project
.
id
)),
'allow_multi_rule'
:
@project
.
multiple_approval_rules_available?
.
to_s
}
}
.text-center.prepend-top-default
=
sprite_icon
(
'spinner'
,
size:
24
,
css_class:
'gl-spinner'
)
-
if
project
.
code_owner_approval_required_available?
.form-group.require-code-owner-approval
...
...
ee/app/views/shared/issuable/_approvals.html.haml
View file @
57f85b8b
...
...
@@ -11,7 +11,13 @@
=
form
.
label
:approver_ids
,
class:
'col-form-label col-sm-2'
do
Approvers
.col-sm-10
=
render
'shared/issuable/approvals_multiple_rule'
,
issuable:
issuable
,
presenter:
presenter
#js-mr-approvals-input
{
data:
{
'project_id'
:
@target_project
.
id
,
'can_edit'
:
can?
(
current_user
,
:update_approvers
,
issuable
).
to_s
,
'allow_multi_rule'
:
@target_project
.
multiple_approval_rules_available?
.
to_s
,
'mr_id'
:
issuable
.
iid
,
'mr_settings_path'
:
presenter
.
api_approval_settings_path
,
'project_settings_path'
:
presenter
.
api_project_approval_settings_path
}
}
=
sprite_icon
(
'spinner'
,
size:
24
,
css_class:
'gl-spinner'
)
-
if
can_update_approvers
-
approver_presenter
=
MergeRequestApproverPresenter
.
new
(
issuable
,
skip_user:
current_user
)
.form-text.text-muted.suggested-approvers
...
...
ee/app/views/shared/issuable/_approvals_multiple_rule.html.haml
deleted
100644 → 0
View file @
8c6b936b
#js-mr-approvals-input
{
data:
{
'project_id'
:
@target_project
.
id
,
'can_edit'
:
can?
(
current_user
,
:update_approvers
,
issuable
).
to_s
,
'allow_multi_rule'
:
@target_project
.
multiple_approval_rules_available?
.
to_s
,
'mr_id'
:
issuable
.
iid
,
'mr_settings_path'
:
presenter
.
api_approval_settings_path
,
'project_settings_path'
:
presenter
.
api_project_approval_settings_path
}
}
=
sprite_icon
(
'spinner'
,
size:
24
,
css_class:
'gl-spinner'
)
ee/app/views/shared/merge_request_approvals_settings/_multiple_rules_form.html.haml
deleted
100644 → 0
View file @
8c6b936b
.form-group
=
form
.
label
:approver_ids
,
class:
'label-bold'
do
=
_
(
"Add approvers"
)
#js-mr-approvals-settings
{
data:
{
'project_id'
:
@project
.
id
,
'project_path'
:
expose_path
(
api_v4_projects_path
(
id:
@project
.
id
)),
'settings_path'
:
expose_path
(
api_v4_projects_approval_settings_path
(
id:
@project
.
id
)),
'rules_path'
:
expose_path
(
api_v4_projects_approval_settings_rules_path
(
id:
@project
.
id
)),
'allow_multi_rule'
:
@project
.
multiple_approval_rules_available?
.
to_s
}
}
.text-center.prepend-top-default
=
sprite_icon
(
'spinner'
,
size:
24
,
css_class:
'gl-spinner'
)
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