diff options
author | Douwe Maan <douwe@selenight.nl> | 2016-11-24 14:32:32 +0800 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2016-11-24 14:32:32 +0800 |
commit | ba5e98bb701672d0cf1d98a80272c16a754ec83c (patch) | |
tree | 89a691e8b71ced5aa59f856a34c584b4a9394382 /app/controllers/projects/notes_controller.rb | |
parent | d0c0c75ca9568bc3ec00c341a6053623d85e6201 (diff) | |
download | gitlab-ce-ba5e98bb701672d0cf1d98a80272c16a754ec83c.tar.gz |
Backport Note#commands_changes from EEbackport-commands-params
Diffstat (limited to 'app/controllers/projects/notes_controller.rb')
-rw-r--r-- | app/controllers/projects/notes_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index f029fde2a2f..15ca080c696 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -197,6 +197,7 @@ class Projects::NotesController < Projects::ApplicationController ) end + attrs[:commands_changes] = note.commands_changes unless attrs[:award] attrs end |