Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-07-26 17:47:19 +0300
committerPhil Hughes <me@iamphill.com>2016-07-26 17:47:19 +0300
commita678fef83611ea873d252941586c18171cd6ba07 (patch)
treed329b902a7784b4a6be14980f8a94647a8fb9a00 /app/controllers/projects/notes_controller.rb
parent5e8606562df861e22d80e888457300f862aeb89b (diff)
Added resolved by users name into tooltip
Diffstat (limited to 'app/controllers/projects/notes_controller.rb')
-rw-r--r--app/controllers/projects/notes_controller.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index fb9d027ce03..ad7376b8574 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -72,7 +72,9 @@ class Projects::NotesController < Projects::ApplicationController
note.resolve!(current_user)
- head :ok
+ render json: {
+ resolved_by: note.resolved_by.try(:name)
+ }
end
def unresolve