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
3be2fb3f
Commit
3be2fb3f
authored
Dec 08, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unneeded dom prop initialization.
parent
714a81ad
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
9 deletions
+6
-9
app/views/projects/merge_requests/widget/_open.html.haml
app/views/projects/merge_requests/widget/_open.html.haml
+6
-9
No files found.
app/views/projects/merge_requests/widget/_open.html.haml
View file @
3be2fb3f
-
approvers_names
=
@merge_request
.
approvers_left
.
map
(
&
:name
).
to_json
#merge-request-widget-app
.mr-state-widget
{
'data-endpoint'
=>
'/myendpoint/tho'
}
-
approvals_required
=
@merge_request
.
approvals_required
-
approvals_left
=
@merge_request
.
approvals_left
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_tag
(
'merge_request_widget/widget_bundle.js'
)
#merge-request-widget-app
.mr-state-widget
{
'data-approved-by-users'
=>
@merge_request
.
approved_by_users
.
to_json
,
'data-approver-names'
=>
approvers_names
,
'data-approvals-left'
=>
approvals_left
,
'data-approvals-required'
=>
approvals_required
,
'data-endpoint'
=>
'/myendpoint/tho'
}
=
render
'projects/merge_requests/widget/heading'
=
render
'projects/merge_requests/widget/heading'
.mr-widget-body
.mr-widget-body
-# After conflicts are resolved, the user is redirected back to the MR page.
-# After conflicts are resolved, the user is redirected back to the MR page.
...
@@ -30,7 +24,7 @@
...
@@ -30,7 +24,7 @@
-
elsif
@merge_request
.
work_in_progress?
-
elsif
@merge_request
.
work_in_progress?
=
render
'projects/merge_requests/widget/open/wip'
=
render
'projects/merge_requests/widget/open/wip'
-
elsif
@merge_request
.
requires_approve?
&&
!
@merge_request
.
approved?
-
elsif
@merge_request
.
requires_approve?
&&
!
@merge_request
.
approved?
%approvals-body
{
':approver-names'
=>
'approvals.approverNames'
,
':approvals-left'
=>
'approvals.approvalsLeft'
,
':user-can-approve'
=>
'approvals.userCanApprove'
,
':user-has-approved'
=>
'approvals.userHasApproved'
}
%approvals-body
-
elsif
@merge_request
.
merge_when_build_succeeds?
-
elsif
@merge_request
.
merge_when_build_succeeds?
=
render
'projects/merge_requests/widget/open/merge_when_build_succeeds'
=
render
'projects/merge_requests/widget/open/merge_when_build_succeeds'
-
elsif
!
@merge_request
.
can_be_merged_by?
(
current_user
)
-
elsif
!
@merge_request
.
can_be_merged_by?
(
current_user
)
...
@@ -54,5 +48,8 @@
...
@@ -54,5 +48,8 @@
=
mr_assign_issues_link
=
mr_assign_issues_link
-
if
@merge_request
.
approvals
.
any?
-
if
@merge_request
.
approvals
.
any?
%approvals-footer
{
':approved-by-users'
=>
'approvals.approvedByUsers'
,
':approver-names'
=>
'approvals.approverNames'
,
':approvals-left'
=>
'approvals.approvalsLeft'
,
':user-can-approve'
=>
'approvals.userCanApprove'
,
':user-has-approved'
=>
'approvals.userHasApproved'
,
'pending-avatar-svg'
=>
custom_icon
(
'icon_dotted_circle'
),
'checkmark-svg'
=>
custom_icon
(
'icon_checkmark'
)
}
%approvals-footer
{
'pending-avatar-svg'
=>
custom_icon
(
'icon_dotted_circle'
),
'checkmark-svg'
=>
custom_icon
(
'icon_checkmark'
)
}
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_tag
(
'merge_request_widget/widget_bundle.js'
)
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