summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-11-24 14:32:32 +0800
committerDouwe Maan <douwe@selenight.nl>2016-11-24 14:32:32 +0800
commitba5e98bb701672d0cf1d98a80272c16a754ec83c (patch)
tree89a691e8b71ced5aa59f856a34c584b4a9394382
parentd0c0c75ca9568bc3ec00c341a6053623d85e6201 (diff)
downloadgitlab-ce-backport-commands-params.tar.gz
Backport Note#commands_changes from EEbackport-commands-params
-rw-r--r--app/controllers/projects/notes_controller.rb1
-rw-r--r--app/models/note.rb3
-rw-r--r--app/services/notes/create_service.rb2
3 files changed, 6 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
diff --git a/app/models/note.rb b/app/models/note.rb
index 9ff5e308ed2..ed4224e3046 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -19,6 +19,9 @@ class Note < ActiveRecord::Base
# Banzai::ObjectRenderer
attr_accessor :user_visible_reference_count
+ # Attribute used to store the attributes that have ben changed by slash commands.
+ attr_accessor :commands_changes
+
default_value_for :system, false
attr_mentionable :note, pipeline: :note
diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index 7935fabe2da..d75592e31f3 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -43,6 +43,8 @@ module Notes
if only_commands
note.errors.add(:commands_only, 'Your commands have been executed!')
end
+
+ note.commands_changes = command_params.keys
end
note