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
15cfa5ca
Commit
15cfa5ca
authored
Jun 11, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix automerge
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
946b4ced
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
app/assets/javascripts/merge_request_widget.js.coffee
app/assets/javascripts/merge_request_widget.js.coffee
+1
-1
app/views/projects/merge_requests/widget/open/_check.html.haml
...iews/projects/merge_requests/widget/open/_check.html.haml
+3
-4
No files found.
app/assets/javascripts/merge_request_widget.js.coffee
View file @
15cfa5ca
...
...
@@ -19,7 +19,7 @@ class @MergeRequestWidget
when
'merged'
location
.
reload
()
else
setTimeout
(
merge_request
.
mergeInProgress
,
3000
)
setTimeout
(
merge_request
_widget
.
mergeInProgress
,
3000
)
dataType
:
'json'
getMergeStatus
:
->
...
...
app/views/projects/merge_requests/widget/open/_check.html.haml
View file @
15cfa5ca
%p
%strong
%i
.fa.fa-spinner.fa-spin
Checking automatic merge…
%strong
%i
.fa.fa-spinner.fa-spin
Checking automatic merge…
:coffeescript
$ ->
...
...
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