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
5f0aea70
Commit
5f0aea70
authored
8 years ago
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed incorrect class names used in merge request widget
parent
182d1525
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
7 deletions
+6
-7
app/assets/javascripts/merge_request_widget.js.es6
app/assets/javascripts/merge_request_widget.js.es6
+3
-1
app/assets/javascripts/merge_request_widget/approvals/components/approvals_body.js.es6
...request_widget/approvals/components/approvals_body.js.es6
+1
-1
app/assets/javascripts/merge_request_widget/approvals/components/approvals_footer.js.es6
...quest_widget/approvals/components/approvals_footer.js.es6
+1
-2
app/views/projects/merge_requests/widget/_open.html.haml
app/views/projects/merge_requests/widget/_open.html.haml
+1
-3
No files found.
app/assets/javascripts/merge_request_widget.js.es6
View file @
5f0aea70
...
@@ -143,7 +143,9 @@
...
@@ -143,7 +143,9 @@
MergeRequestWidget.prototype.getMergeStatus = function() {
MergeRequestWidget.prototype.getMergeStatus = function() {
return $.get(this.opts.merge_check_url, function(data) {
return $.get(this.opts.merge_check_url, function(data) {
return $('.mr-state-widget').replaceWith(data);
var $html = $(data);
$('.mr-widget-body').replaceWith($html.find('.mr-widget-body'));
$('.mr-widget-footer:not(.mr-approvals-footer)').replaceWith($html.find('.mr-widget-footer:not(.mr-approvals-footer)'));
});
});
};
};
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/merge_request_widget/approvals/components/approvals_body.js.es6
View file @
5f0aea70
...
@@ -76,7 +76,7 @@
...
@@ -76,7 +76,7 @@
gl.ApprovalsStore.initStoreOnce();
gl.ApprovalsStore.initStoreOnce();
},
},
template: `
template: `
<div class='approvals-body mr-widget-footer'>
<div class='approvals-body mr-widget-footer
mr-approvals-footer
'>
<h4> Requires {{ approvalsRequiredStringified }}
<h4> Requires {{ approvalsRequiredStringified }}
<span v-if='showSuggestedApprovers'> (from {{ approverNamesStringified }}) </span>
<span v-if='showSuggestedApprovers'> (from {{ approverNamesStringified }}) </span>
</h4>
</h4>
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/merge_request_widget/approvals/components/approvals_footer.js.es6
View file @
5f0aea70
...
@@ -57,7 +57,7 @@
...
@@ -57,7 +57,7 @@
gl.ApprovalsStore.initStoreOnce();
gl.ApprovalsStore.initStoreOnce();
},
},
template: `
template: `
<div class='mr-widget-footer approved-by-users approvals-footer clearfix'>
<div class='mr-widget-footer approved-by-users approvals-footer clearfix
mr-approvals-footer
'>
<span class='approvers-prefix'> Approved by </span>
<span class='approvers-prefix'> Approved by </span>
<span v-for='approver in approvedBy'>
<span v-for='approver in approvedBy'>
<link-to-member-avatar
<link-to-member-avatar
...
@@ -90,4 +90,3 @@
...
@@ -90,4 +90,3 @@
`,
`,
});
});
})();
})();
This diff is collapsed.
Click to expand it.
app/views/projects/merge_requests/widget/_open.html.haml
View file @
5f0aea70
...
@@ -56,11 +56,9 @@
...
@@ -56,11 +56,9 @@
#{
mr_issues_mentioned_but_not_closing
.
size
>
1
?
'are'
:
'is'
}
mentioned but will not be closed.
#{
mr_issues_mentioned_but_not_closing
.
size
>
1
?
'are'
:
'is'
}
mentioned but will not be closed.
-
if
@merge_request
.
requires_approve?
-
if
@merge_request
.
requires_approve?
.mr-widget-footer
{
'v-show'
=>
'!showApprovals'
}
.mr-widget-footer
.mr-approvals-footer
{
'v-show'
=>
'!showApprovals'
}
=
icon
(
"spinner spin"
)
=
icon
(
"spinner spin"
)
Checking approval status for this merge request.
Checking approval status for this merge request.
.approvals-components
{
'v-show'
=>
'showApprovals'
}
.approvals-components
{
'v-show'
=>
'showApprovals'
}
=
render
'projects/merge_requests/widget/open/approvals_body'
=
render
'projects/merge_requests/widget/open/approvals_body'
=
render
'projects/merge_requests/widget/open/approvals_footer'
=
render
'projects/merge_requests/widget/open/approvals_footer'
This diff is collapsed.
Click to expand it.
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