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
Boxiang Sun
gitlab-ce
Commits
4af0146f
Commit
4af0146f
authored
Jul 13, 2016
by
Phil Hughes
Committed by
Douwe Maan
Jul 24, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Assigns to variable rather than using VueJS method
parent
511a0788
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
7 deletions
+6
-7
app/assets/javascripts/line_comments/components/resolve_all.js.coffee
...avascripts/line_comments/components/resolve_all.js.coffee
+2
-2
app/assets/javascripts/line_comments/components/resolve_btn.js.coffee
...avascripts/line_comments/components/resolve_btn.js.coffee
+2
-3
app/controllers/projects/notes_controller.rb
app/controllers/projects/notes_controller.rb
+2
-2
No files found.
app/assets/javascripts/line_comments/components/resolve_all.js.coffee
View file @
4af0146f
...
@@ -19,11 +19,11 @@
...
@@ -19,11 +19,11 @@
methods
:
methods
:
updateAll
:
->
updateAll
:
->
ids
=
CommentsStore
.
getAllForState
(
this
.
allResolved
)
ids
=
CommentsStore
.
getAllForState
(
this
.
allResolved
)
this
.
$set
(
'loading'
,
true
)
this
.
loading
=
true
ResolveService
ResolveService
.
resolveAll
(
this
.
endpoint
,
ids
,
!
this
.
allResolved
)
.
resolveAll
(
this
.
endpoint
,
ids
,
!
this
.
allResolved
)
.
done
=>
.
done
=>
CommentsStore
.
updateAll
(
!
this
.
allResolved
)
CommentsStore
.
updateAll
(
!
this
.
allResolved
)
.
always
=>
.
always
=>
this
.
$set
(
'loading'
,
false
)
this
.
loading
=
false
app/assets/javascripts/line_comments/components/resolve_btn.js.coffee
View file @
4af0146f
...
@@ -16,16 +16,15 @@
...
@@ -16,16 +16,15 @@
.
tooltip
(
'hide'
)
.
tooltip
(
'hide'
)
.
tooltip
(
'fixTitle'
)
.
tooltip
(
'fixTitle'
)
resolve
:
->
resolve
:
->
this
.
$set
(
'loading'
,
true
)
this
.
loading
=
true
ResolveService
ResolveService
.
resolve
(
this
.
endpoint
,
!
this
.
isResolved
)
.
resolve
(
this
.
endpoint
,
!
this
.
isResolved
)
.
done
=>
.
done
=>
this
.
$set
(
'loading'
,
false
)
CommentsStore
.
update
(
this
.
noteId
,
!
this
.
isResolved
)
CommentsStore
.
update
(
this
.
noteId
,
!
this
.
isResolved
)
this
.
$nextTick
this
.
updateTooltip
this
.
$nextTick
this
.
updateTooltip
.
always
=>
.
always
=>
this
.
$set
(
'loading'
,
false
)
this
.
loading
=
false
compiled
:
->
compiled
:
->
$
(
this
.
$els
.
button
).
tooltip
()
$
(
this
.
$els
.
button
).
tooltip
()
destroyed
:
->
destroyed
:
->
...
...
app/controllers/projects/notes_controller.rb
View file @
4af0146f
...
@@ -68,12 +68,12 @@ class Projects::NotesController < Projects::ApplicationController
...
@@ -68,12 +68,12 @@ class Projects::NotesController < Projects::ApplicationController
def
resolve
def
resolve
sleep
2
sleep
2
render
nothing:
true
,
status:
200
head
:ok
end
end
def
resolve_all
def
resolve_all
sleep
2
sleep
2
render
nothing:
true
,
status:
200
head
:ok
end
end
private
private
...
...
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