BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
b2f2df3b
Commit
b2f2df3b
authored
Mar 03, 2016
by
Jacob Schatz
Committed by
Phil Hughes
Mar 18, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add page reload as a temporary boring solution
parent
e9c5e312
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
merge_request_widget.js.coffee
app/assets/javascripts/merge_request_widget.js.coffee
+9
-2
_show.html.haml
app/views/projects/merge_requests/widget/_show.html.haml
+1
-1
No files found.
app/assets/javascripts/merge_request_widget.js.coffee
View file @
b2f2df3b
...
...
@@ -11,7 +11,9 @@ class @MergeRequestWidget
modal
=
$
(
'#modal_merge_info'
).
modal
(
show
:
false
)
@
getBuildStatus
()
# clear the build poller
$
(
document
).
on
'page:fetch'
,
(
e
)
=>
clearInterval
(
@
fetchBuildStatusInterval
)
$
(
document
)
.
off
'page:fetch'
.
on
'page:fetch'
,
(
e
)
=>
clearInterval
(
@
fetchBuildStatusInterval
)
mergeInProgress
:
(
deleteSourceBranch
=
false
)
->
$
.
ajax
...
...
@@ -60,7 +62,12 @@ class @MergeRequestWidget
if
data
.
status
isnt
_this
.
opts
.
current_status
notify
(
"Build
#{
_this
.
ciLabelForStatus
(
data
.
status
)
}
"
,
_this
.
opts
.
ci_message
.
replace
(
'{{status}}'
,
_this
.
ciLabelForStatus
(
data
.
status
)));
_this
.
ciLabelForStatus
(
data
.
status
)),
_this
.
opts
.
gitlab_icon
)
setTimeout
(
->
window
.
location
.
reload
()
return
),
2000
_this
.
opts
.
current_status
=
data
.
status
$
(
'.mr-widget-heading i'
)
.
removeClass
()
...
...
app/views/projects/merge_requests/widget/_show.html.haml
View file @
b2f2df3b
...
...
@@ -13,7 +13,7 @@
url_to_automerge_check
:
"
#{
merge_check_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
)
}
"
,
check_enable
:
#{
@merge_request
.
unchecked?
?
"true"
:
"false"
}
,
url_to_ci_check
:
"
#{
ci_status_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
)
}
"
,
gitlab_icon
:
#{
asset_path
"gitlab_logo.png"
}
,
gitlab_icon
:
"
#{
asset_path
'gitlab_logo.png'
}
"
,
ci_enable
:
#{
@project
.
ci_service
?
"true"
:
"false"
}
};
...
...
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