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
Léo-Paul Géneau
gitlab-ce
Commits
ad3f4922
Commit
ad3f4922
authored
Jun 29, 2012
by
randx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge Request: fix automerge widget
parent
2def1c72
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/assets/javascripts/merge_requests.js
app/assets/javascripts/merge_requests.js
+1
-1
No files found.
app/assets/javascripts/merge_requests.js
View file @
ad3f4922
...
@@ -30,7 +30,7 @@ var MergeRequest = {
...
@@ -30,7 +30,7 @@ var MergeRequest = {
self
.
showState
(
self
.
opts
.
current_state
);
self
.
showState
(
self
.
opts
.
current_state
);
if
(
$
(
"
.automerge_widget
"
).
length
&&
self
.
opts
.
check_enable
){
if
(
$
(
"
.automerge_widget
"
).
length
&&
self
.
opts
.
check_enable
){
$
.
get
(
opts
.
url_to_automerge_check
,
function
(
data
){
$
.
get
(
self
.
opts
.
url_to_automerge_check
,
function
(
data
){
self
.
showState
(
data
.
state
);
self
.
showState
(
data
.
state
);
},
"
json
"
);
},
"
json
"
);
}
}
...
...
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