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
2d0f9dd0
Commit
2d0f9dd0
authored
Dec 16, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix merge widget JS for buttons
parent
76708c2c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
10 deletions
+8
-10
app/views/projects/merge_requests/widget/open/_accept.html.haml
...ews/projects/merge_requests/widget/open/_accept.html.haml
+8
-10
No files found.
app/views/projects/merge_requests/widget/open/_accept.html.haml
View file @
2d0f9dd0
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
%span
.caret
%span
.caret
%span
.sr-only
%span
.sr-only
Select Merge Moment
Select Merge Moment
%ul
.dropdown-menu.dropdown-menu-right
{
role:
'menu'
}
%ul
.
js-merge-dropdown.
dropdown-menu.dropdown-menu-right
{
role:
'menu'
}
%li
%li
=
link_to
"#"
,
class:
"merge_when_build_succeeds"
do
=
link_to
"#"
,
class:
"merge_when_build_succeeds"
do
=
icon
(
'check fw'
)
=
icon
(
'check fw'
)
...
@@ -42,21 +42,19 @@
...
@@ -42,21 +42,19 @@
=
hidden_field_tag
:merge_when_build_succeeds
,
""
,
autocomplete:
"off"
=
hidden_field_tag
:merge_when_build_succeeds
,
""
,
autocomplete:
"off"
:javascript
:javascript
$
(
'
.accept_merge_request
'
).
on
(
'
click
'
,
function
()
{
$
(
'
.js-merge-button
'
).
html
(
"
<i class='fa fa-spinner fa-spin'></i> Merge in progress
"
);
});
$
(
'
.accept-mr-form
'
).
on
(
'
ajax:send
'
,
function
()
{
$
(
'
.accept-mr-form
'
).
on
(
'
ajax:send
'
,
function
()
{
$
(
"
.accept-mr-form :input
"
).
disable
();
$
(
"
.accept-mr-form :input
"
).
disable
();
});
});
$
(
'
a.accept_merge_request
'
).
on
(
'
click
'
,
function
(
e
)
{
$
(
'
.accept_merge_request
'
).
on
(
'
click
'
,
function
()
{
e
.
preventDefault
();
$
(
'
.js-merge-button
'
).
html
(
"
<i class='fa fa-spinner fa-spin'></i> Merge in progress
"
);
$
(
this
).
closest
(
"
form
"
).
submit
();
});
});
$
(
'
a.merge_when_build_succeeds
'
).
on
(
'
click
'
,
function
(
e
)
{
$
(
'
.merge_when_build_succeeds
'
).
on
(
'
click
'
,
function
()
{
e
.
preventDefault
();
$
(
"
#merge_when_build_succeeds
"
).
val
(
"
1
"
);
$
(
"
#merge_when_build_succeeds
"
).
val
(
"
1
"
);
});
$
(
'
.js-merge-dropdown a
'
).
on
(
'
click
'
,
function
(
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