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
b471c76b
Commit
b471c76b
authored
Apr 06, 2016
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reset MR opts
parent
936be025
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
app/assets/javascripts/merge_request_widget.js.coffee
app/assets/javascripts/merge_request_widget.js.coffee
+7
-1
app/views/projects/merge_requests/widget/_show.html.haml
app/views/projects/merge_requests/widget/_show.html.haml
+2
-0
No files found.
app/assets/javascripts/merge_request_widget.js.coffee
View file @
b471c76b
...
@@ -15,6 +15,8 @@ class @MergeRequestWidget
...
@@ -15,6 +15,8 @@ class @MergeRequestWidget
@
pollCIStatus
()
@
pollCIStatus
()
notifyPermissions
()
notifyPermissions
()
setOpts
:
(
@
opts
)
->
mergeInProgress
:
(
deleteSourceBranch
=
false
)
->
mergeInProgress
:
(
deleteSourceBranch
=
false
)
->
$
.
ajax
$
.
ajax
type
:
'GET'
type
:
'GET'
...
@@ -48,7 +50,7 @@ class @MergeRequestWidget
...
@@ -48,7 +50,7 @@ class @MergeRequestWidget
@
getCIStatus
(
true
)
@
getCIStatus
(
true
)
@
readyForCICheck
=
false
@
readyForCICheck
=
false
),
5
000
),
10
000
getCIStatus
:
(
showNotification
)
->
getCIStatus
:
(
showNotification
)
->
_this
=
@
_this
=
@
...
@@ -61,6 +63,10 @@ class @MergeRequestWidget
...
@@ -61,6 +63,10 @@ class @MergeRequestWidget
@
firstCICheck
=
false
@
firstCICheck
=
false
@
opts
.
ci_status
=
data
.
status
@
opts
.
ci_status
=
data
.
status
if
@
opts
.
ci_status
is
''
@
opts
.
ci_status
=
data
.
status
return
if
data
.
status
isnt
@
opts
.
ci_status
if
data
.
status
isnt
@
opts
.
ci_status
@
showCIStatus
data
.
status
@
showCIStatus
data
.
status
if
data
.
coverage
if
data
.
coverage
...
...
app/views/projects/merge_requests/widget/_show.html.haml
View file @
b471c76b
...
@@ -22,4 +22,6 @@
...
@@ -22,4 +22,6 @@
if
(
typeof
merge_request_widget
===
'
undefined
'
)
{
if
(
typeof
merge_request_widget
===
'
undefined
'
)
{
merge_request_widget
=
new
MergeRequestWidget
(
opts
);
merge_request_widget
=
new
MergeRequestWidget
(
opts
);
}
else
{
merge_request_widget
.
setOpts
(
opts
);
}
}
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