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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
d8740cfe
Commit
d8740cfe
authored
Dec 21, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move javascript for widget check to ci_bundle.
parent
3bbe19d3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
25 deletions
+40
-25
app/assets/javascripts/merge_request_widget/ci_bundle.js.es6
app/assets/javascripts/merge_request_widget/ci_bundle.js.es6
+37
-19
app/views/projects/merge_requests/widget/open/_check.html.haml
...iews/projects/merge_requests/widget/open/_check.html.haml
+3
-6
No files found.
app/assets/javascripts/merge_request_widget/ci_bundle.js.es6
View file @
d8740cfe
$(() => {
/* global merge_request_widget */
/* 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,
* but Vue chokes on script tags and prevents their execution. So it was moved here
* temporarily.
* */
$('.accept-mr-form').on('ajax:send', () => {
(() => {
$('.accept-mr-form :input').disable();
$(() => {
});
/* 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,
* but Vue chokes on script tags and prevents their execution. So it was moved here
* temporarily.
* */
$('.accept_merge_request').on('click', () => {
if ($('.accept-mr-form').length) {
$('.js-merge-button').html('<i class="fa fa-spinner fa-spin"></i> Merge in progress');
$('.accept-mr-form').on('ajax:send', () => {
});
$('.accept-mr-form :input').disable();
});
$('.merge_when_build_succeeds').on('click', () => {
$('.accept_merge_request').on('click', () => {
$('#merge_when_build_succeeds').val('1');
$('.js-merge-button').html('<i class="fa fa-spinner fa-spin"></i> Merge in progress');
});
});
$('.merge_when_build_succeeds').on('click', () => {
$('#merge_when_build_succeeds').val('1');
});
$('.js-merge-dropdown a').on('click', (e) => {
e.preventDefault();
$(this).closest('form').submit();
});
} else if ($('.rebase-in-progress').length) {
merge_request_widget.rebaseInProgress();
} else if ($('.rebase-mr-form').length) {
$('.rebase-mr-form').on('ajax:send', () => {
$('.rebase-mr-form :input').disable();
});
$('.js-merge-dropdown a').on('click', (e) => {
$('.js-rebase-button').on('click', () => {
e.preventDefault();
$('.js-rebase-button').html("<i class='fa fa-spinner fa-spin'></i> Rebase in progress");
$(this).closest('form').submit();
});
} else {
merge_request_widget.getMergeStatus();
}
});
});
});
})
()
;
app/views/projects/merge_requests/widget/open/_check.html.haml
View file @
d8740cfe
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_tag
(
'merge_request_widget/ci_bundle.js'
)
%strong
%strong
=
icon
(
"spinner spin"
)
=
icon
(
"spinner spin"
)
Checking ability to merge automatically
…
Checking ability to merge automatically
…
:javascript
$
(
function
()
{
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