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
Tatuya Kamada
gitlab-ce
Commits
9b115ce4
Commit
9b115ce4
authored
Aug 03, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Actually don't send resolved notifications when deleting a note
parent
a3a67209
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
app/controllers/projects/notes_controller.rb
app/controllers/projects/notes_controller.rb
+2
-0
app/services/notes/delete_service.rb
app/services/notes/delete_service.rb
+0
-4
No files found.
app/controllers/projects/notes_controller.rb
View file @
9b115ce4
...
@@ -72,6 +72,8 @@ class Projects::NotesController < Projects::ApplicationController
...
@@ -72,6 +72,8 @@ class Projects::NotesController < Projects::ApplicationController
note
.
resolve!
(
current_user
)
note
.
resolve!
(
current_user
)
MergeRequests
::
AllDiscussionsResolvedService
.
new
(
project
,
current_user
).
execute
(
note
.
noteable
)
discussion
=
note
.
discussion
discussion
=
note
.
discussion
render
json:
{
render
json:
{
...
...
app/services/notes/delete_service.rb
View file @
9b115ce4
...
@@ -3,10 +3,6 @@ module Notes
...
@@ -3,10 +3,6 @@ module Notes
def
execute
(
note
)
def
execute
(
note
)
note
.
destroy
note
.
destroy
note
.
reset_events_cache
note
.
reset_events_cache
if
note
.
resolvable?
MergeRequests
::
AllDiscussionsResolvedService
.
new
(
project
,
current_user
).
execute
(
note
.
noteable
)
end
end
end
end
end
end
end
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