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
Jérome Perrin
gitlab-ce
Commits
8ec1dcf2
Commit
8ec1dcf2
authored
May 11, 2016
by
Yorick Peterse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'fix-build-notification-on-merge-page-change' into 'master'
This reverts commit
d1ba0986
.
parent
0dc34317
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
12 deletions
+11
-12
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/merge_request_widget.js.coffee
app/assets/javascripts/merge_request_widget.js.coffee
+4
-5
app/views/projects/merge_requests/widget/_heading.html.haml
app/views/projects/merge_requests/widget/_heading.html.haml
+6
-1
spec/javascripts/merge_request_widget_spec.js.coffee
spec/javascripts/merge_request_widget_spec.js.coffee
+0
-6
No files found.
CHANGELOG
View file @
8ec1dcf2
...
@@ -9,6 +9,7 @@ v 8.7.4
...
@@ -9,6 +9,7 @@ v 8.7.4
- Running rake gitlab:db:drop_tables now drops tables with cascade !4020
- Running rake gitlab:db:drop_tables now drops tables with cascade !4020
- Running rake gitlab:db:drop_tables uses "IF EXISTS" as a precaution !4100
- Running rake gitlab:db:drop_tables uses "IF EXISTS" as a precaution !4100
- Use a case-insensitive comparison in sanitizing URI schemes
- Use a case-insensitive comparison in sanitizing URI schemes
- Links for Redmine issue references are generated correctly again (Benedikt Huss)
v 8.7.3
v 8.7.3
- Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented
- Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented
...
...
app/assets/javascripts/merge_request_widget.js.coffee
View file @
8ec1dcf2
...
@@ -9,12 +9,11 @@ class @MergeRequestWidget
...
@@ -9,12 +9,11 @@ class @MergeRequestWidget
constructor
:
(
@
opts
)
->
constructor
:
(
@
opts
)
->
$
(
'#modal_merge_info'
).
modal
(
show
:
false
)
$
(
'#modal_merge_info'
).
modal
(
show
:
false
)
@
firstCICheck
=
true
@
firstCICheck
=
true
@
readyForCICheck
=
fals
e
@
readyForCICheck
=
tru
e
clearInterval
@
fetchBuildStatusInterval
clearInterval
@
fetchBuildStatusInterval
@
clearEventListeners
()
@
clearEventListeners
()
@
addEventListeners
()
@
addEventListeners
()
@
getCIStatus
(
false
)
@
pollCIStatus
()
@
pollCIStatus
()
notifyPermissions
()
notifyPermissions
()
...
@@ -72,7 +71,7 @@ class @MergeRequestWidget
...
@@ -72,7 +71,7 @@ class @MergeRequestWidget
if
data
.
status
is
''
if
data
.
status
is
''
return
return
if
@
firstC
I
Check
||
data
.
status
isnt
@
opts
.
ci_status
and
data
.
status
?
if
@
firstC
i
Check
||
data
.
status
isnt
@
opts
.
ci_status
and
data
.
status
?
@
opts
.
ci_status
=
data
.
status
@
opts
.
ci_status
=
data
.
status
@
showCIStatus
data
.
status
@
showCIStatus
data
.
status
if
data
.
coverage
if
data
.
coverage
...
@@ -80,7 +79,7 @@ class @MergeRequestWidget
...
@@ -80,7 +79,7 @@ class @MergeRequestWidget
# The first check should only update the UI, a notification
# The first check should only update the UI, a notification
# should only be displayed on status changes
# should only be displayed on status changes
if
showNotification
and
not
@
firstC
I
Check
if
showNotification
and
not
@
firstC
i
Check
status
=
@
ciLabelForStatus
(
data
.
status
)
status
=
@
ciLabelForStatus
(
data
.
status
)
if
status
is
"preparing"
if
status
is
"preparing"
...
@@ -103,7 +102,7 @@ class @MergeRequestWidget
...
@@ -103,7 +102,7 @@ class @MergeRequestWidget
@
close
()
@
close
()
Turbolinks
.
visit
_this
.
opts
.
builds_path
Turbolinks
.
visit
_this
.
opts
.
builds_path
)
)
@
firstC
I
Check
=
false
@
firstC
i
Check
=
false
showCIStatus
:
(
state
)
->
showCIStatus
:
(
state
)
->
$
(
'.ci_widget'
).
hide
()
$
(
'.ci_widget'
).
hide
()
...
...
app/views/projects/merge_requests/widget/_heading.html.haml
View file @
8ec1dcf2
...
@@ -42,3 +42,8 @@
...
@@ -42,3 +42,8 @@
.ci_widget.ci-error
{
style:
"display:none"
}
.ci_widget.ci-error
{
style:
"display:none"
}
=
icon
(
"times-circle"
)
=
icon
(
"times-circle"
)
Could not connect to the CI server. Please check your settings and try again.
Could not connect to the CI server. Please check your settings and try again.
:javascript
$
(
function
()
{
merge_request_widget
.
getCIStatus
(
false
);
});
spec/javascripts/merge_request_widget_spec.js.coffee
View file @
8ec1dcf2
...
@@ -47,9 +47,3 @@ describe 'MergeRequestWidget', ->
...
@@ -47,9 +47,3 @@ describe 'MergeRequestWidget', ->
spy
=
spyOn
(
@
class
,
'showCICoverage'
).
and
.
stub
()
spy
=
spyOn
(
@
class
,
'showCICoverage'
).
and
.
stub
()
@
class
.
getCIStatus
(
false
)
@
class
.
getCIStatus
(
false
)
expect
(
spy
).
not
.
toHaveBeenCalled
()
expect
(
spy
).
not
.
toHaveBeenCalled
()
it
'should not display a notification on the first check after the widget has been created'
,
->
spy
=
spyOn
(
window
,
'notify'
)
@
class
=
new
MergeRequestWidget
(
@
opts
)
@
class
.
getCIStatus
(
true
)
expect
(
spy
).
not
.
toHaveBeenCalled
()
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