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
fcc0f7c6
Commit
fcc0f7c6
authored
Mar 03, 2016
by
Jacob Schatz
Committed by
Phil Hughes
Mar 18, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove repeated build listing
parent
b2f2df3b
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
-4
app/views/projects/merge_requests/widget/_show.html.haml
app/views/projects/merge_requests/widget/_show.html.haml
+3
-1
No files found.
app/assets/javascripts/merge_request_widget.js.coffee
View file @
fcc0f7c6
...
@@ -11,9 +11,6 @@ class @MergeRequestWidget
...
@@ -11,9 +11,6 @@ class @MergeRequestWidget
modal
=
$
(
'#modal_merge_info'
).
modal
(
show
:
false
)
modal
=
$
(
'#modal_merge_info'
).
modal
(
show
:
false
)
@
getBuildStatus
()
@
getBuildStatus
()
# clear the build poller
# clear the build poller
$
(
document
)
.
off
'page:fetch'
.
on
'page:fetch'
,
(
e
)
=>
clearInterval
(
@
fetchBuildStatusInterval
)
mergeInProgress
:
(
deleteSourceBranch
=
false
)
->
mergeInProgress
:
(
deleteSourceBranch
=
false
)
->
$
.
ajax
$
.
ajax
...
@@ -65,7 +62,7 @@ class @MergeRequestWidget
...
@@ -65,7 +62,7 @@ class @MergeRequestWidget
_this
.
ciLabelForStatus
(
data
.
status
)),
_this
.
ciLabelForStatus
(
data
.
status
)),
_this
.
opts
.
gitlab_icon
)
_this
.
opts
.
gitlab_icon
)
setTimeout
(
->
setTimeout
(
->
window
.
location
.
reload
(
)
Turbolinks
.
visit
(
location
.
href
)
return
return
),
2000
),
2000
_this
.
opts
.
current_status
=
data
.
status
_this
.
opts
.
current_status
=
data
.
status
...
...
app/views/projects/merge_requests/widget/_show.html.haml
View file @
fcc0f7c6
...
@@ -27,4 +27,6 @@
...
@@ -27,4 +27,6 @@
opts
.
ci_message
=
"
Build {{status}} for
#{
@merge_request
.
last_commit
.
sha
}
"
;
opts
.
ci_message
=
"
Build {{status}} for
#{
@merge_request
.
last_commit
.
sha
}
"
;
:javascript
:javascript
merge_request_widget
=
new
MergeRequestWidget
(
opts
);
if
(
typeof
merge_request_widget
===
'
undefined
'
)
{
\ No newline at end of file
merge_request_widget
=
new
MergeRequestWidget
(
opts
);
}
\ No newline at end of file
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