summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorHeinrich Lee Yu <heinrich@gitlab.com>2019-03-15 08:07:52 +0800
committerBrett Walker <bwalker@gitlab.com>2019-03-18 13:28:35 -0500
commit3d85406734fc31bb9c9fb95ce26898b65b60b3ea (patch)
treeb7f51a67e2f6b4fc01c6e7b75b381f205102136f /app/controllers
parent45a4bc300c52a6cf17049626ea682d039efa9fc7 (diff)
downloadgitlab-ce-3d85406734fc31bb9c9fb95ce26898b65b60b3ea.tar.gz
Only return `commands_changes` used in frontend
When executing quick actions, this limits the `commands_changes` response to only those used by the frontend
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/concerns/notes_actions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/notes_actions.rb b/app/controllers/concerns/notes_actions.rb
index b4fee93713b..f96d1821095 100644
--- a/app/controllers/concerns/notes_actions.rb
+++ b/app/controllers/concerns/notes_actions.rb
@@ -48,7 +48,7 @@ module NotesActions
respond_to do |format|
format.json do
json = {
- commands_changes: @note.commands_changes
+ commands_changes: @note.commands_changes&.slice(:emoji_award, :time_estimate, :spend_time)
}
if @note.persisted? && return_discussion?