diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-06 20:24:30 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-06 20:24:30 +0200 |
commit | 1311f8c2c15f417c944e5d1113f7f20290c85ca3 (patch) | |
tree | 9a49e178fc13a9986d7d000611a1086034be0c1a /app/controllers | |
parent | ef35ca238dd8ed1c8b8d8c3cfdf64630c6c781ff (diff) | |
parent | 4e38d88df50d85d076110c8b78aaac78772d9554 (diff) | |
download | gitlab-ce-1311f8c2c15f417c944e5d1113f7f20290c85ca3.tar.gz |
Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/concerns/toggle_award_emoji.rb | 11 | ||||
-rw-r--r-- | app/controllers/projects/notes_controller.rb | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/app/controllers/concerns/toggle_award_emoji.rb b/app/controllers/concerns/toggle_award_emoji.rb index 09ff44f291b..036777c80c1 100644 --- a/app/controllers/concerns/toggle_award_emoji.rb +++ b/app/controllers/concerns/toggle_award_emoji.rb @@ -9,13 +9,22 @@ module ToggleAwardEmoji name = params.require(:name) awardable.toggle_award_emoji(name, current_user) - TodoService.new.new_award_emoji(awardable, current_user) + TodoService.new.new_award_emoji(to_todoable(awardable), current_user) render json: { ok: true } end private + def to_todoable(awardable) + case awardable + when Note + awardable.noteable + else + awardable + end + end + def awardable raise NotImplementedError end diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index c205474e999..836f79ff080 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -1,4 +1,6 @@ class Projects::NotesController < Projects::ApplicationController + include ToggleAwardEmoji + # Authorize before_action :authorize_read_note! before_action :authorize_create_note!, only: [:create] @@ -61,6 +63,7 @@ class Projects::NotesController < Projects::ApplicationController def note @note ||= @project.notes.find(params[:id]) end + alias_method :awardable, :note def note_to_html(note) render_to_string( |