diff options
| author | Phil Hughes <me@iamphill.com> | 2016-07-26 15:47:19 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-07-26 15:47:19 +0100 |
| commit | a678fef83611ea873d252941586c18171cd6ba07 (patch) | |
| tree | d329b902a7784b4a6be14980f8a94647a8fb9a00 /app/controllers/projects/notes_controller.rb | |
| parent | 5e8606562df861e22d80e888457300f862aeb89b (diff) | |
| download | gitlab-ce-a678fef83611ea873d252941586c18171cd6ba07.tar.gz | |
Added resolved by users name into tooltip
Diffstat (limited to 'app/controllers/projects/notes_controller.rb')
| -rw-r--r-- | app/controllers/projects/notes_controller.rb | 4 |
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 |