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
0c102894
Commit
0c102894
authored
Dec 21, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Shush eslint.
parent
c09217e7
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
32 deletions
+35
-32
app/assets/javascripts/merge_request_widget/ci_bundle.js.es6
app/assets/javascripts/merge_request_widget/ci_bundle.js.es6
+35
-32
No files found.
app/assets/javascripts/merge_request_widget/ci_bundle.js.es6
View file @
0c102894
$(() => {
/* global merge_request_widget */
(() => {
$(() => {
/* TODO: This needs a better home, or should be refactored. It was previously contained
/* TODO: This needs a better home, or should be refactored. It was previously contained
* in a script tag in app/views/projects/merge_requests/widget/open/_accept.html.haml,
* in a script tag in app/views/projects/merge_requests/widget/open/_accept.html.haml,
* but Vue chokes on script tags and prevents their execution. So it was moved here
* but Vue chokes on script tags and prevents their execution. So it was moved here
...
@@ -22,18 +25,18 @@ $(() => {
...
@@ -22,18 +25,18 @@ $(() => {
e.preventDefault();
e.preventDefault();
$(this).closest('form').submit();
$(this).closest('form').submit();
});
});
} else if ($('.rebase-in-progress').length) {
} else if ($('.rebase-in-progress').length) {
merge_request_widget.rebaseInProgress();
merge_request_widget.rebaseInProgress();
} else if ($('.rebase-mr-form').length) {
} else if ($('.rebase-mr-form').length) {
$('.rebase-mr-form').on('ajax:send', function()
{
$('.rebase-mr-form').on('ajax:send', () =>
{
$('.rebase-mr-form :input').disable();
$('.rebase-mr-form :input').disable();
});
});
$('.js-rebase-button').on('click', function()
{
$('.js-rebase-button').on('click', () =>
{
$('.js-rebase-button').html("<i class='fa fa-spinner fa-spin'></i> Rebase in progress");
$('.js-rebase-button').html("<i class='fa fa-spinner fa-spin'></i> Rebase in progress");
});
});
} else {
} else {
merge_request_widget.getMergeStatus();
merge_request_widget.getMergeStatus();
}
}
});
});
})();
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