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
48ebd782
Commit
48ebd782
authored
Dec 20, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Shush eslint.
parent
ce43b3a3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
11 deletions
+11
-11
app/assets/javascripts/merge_request_widget/approvals/approvals_api.js.es6
...ripts/merge_request_widget/approvals/approvals_api.js.es6
+2
-2
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/ci_bundle.js.es6
app/assets/javascripts/merge_request_widget/ci_bundle.js.es6
+8
-8
No files found.
app/assets/javascripts/merge_request_widget/approvals/approvals_api.js.es6
View file @
48ebd782
/* global Vue */
/* global Vue
, Flash
*/
//= require ./approvals_store
(() => {
...
...
@@ -14,7 +14,7 @@
}
fetchApprovals() {
const flashErrorMessage =
'An error occured while retrieving approval data for this merge request.';
const flashErrorMessage = 'An error occured while retrieving approval data for this merge request.';
return Vue.http.get(this.baseEndpoint).catch((err) => {
console.error('Error fetching approvals', err);
...
...
app/assets/javascripts/merge_request_widget/approvals/components/approvals_body.js.es6
View file @
48ebd782
...
...
@@ -57,7 +57,7 @@
},
showSuggestedApprovers() {
return this.suggestedApprovers && this.suggestedApprovers.length;
}
}
,
},
methods: {
approveMergeRequest() {
...
...
app/assets/javascripts/merge_request_widget/ci_bundle.js.es6
View file @
48ebd782
...
...
@@ -5,20 +5,20 @@ $(() => {
* temporarily.
* */
$('.accept-mr-form').on('ajax:send',
function()
{
$(
".accept-mr-form :input"
).disable();
$('.accept-mr-form').on('ajax:send',
() =>
{
$(
'.accept-mr-form :input'
).disable();
});
$('.accept_merge_request').on('click',
function()
{
$('.js-merge-button').html(
"<i class='fa fa-spinner fa-spin'></i> Merge in progress"
);
$('.accept_merge_request').on('click',
() =>
{
$('.js-merge-button').html(
'<i class="fa fa-spinner fa-spin"></i> Merge in progress'
);
});
$('.merge_when_build_succeeds').on('click',
function()
{
$(
"#merge_when_build_succeeds").val("1"
);
$('.merge_when_build_succeeds').on('click',
() =>
{
$(
'#merge_when_build_succeeds').val('1'
);
});
$('.js-merge-dropdown a').on('click',
function(e)
{
$('.js-merge-dropdown a').on('click',
(e) =>
{
e.preventDefault();
$(this).closest(
"form"
).submit();
$(this).closest(
'form'
).submit();
});
});
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