diff options
| author | Alex Hanselka <alex@gitlab.com> | 2019-03-21 02:10:11 +0300 |
|---|---|---|
| committer | Alex Hanselka <alex@gitlab.com> | 2019-03-21 02:10:11 +0300 |
| commit | ef56cad784ebc2e2a9e368a0199babf9f7287248 (patch) | |
| tree | f86f0eb946bbc36a216449e8e00cd4235ac0b8bc /app | |
| parent | cd1c7e0525cd2e1bcbe69a8da2043e029e906c7b (diff) | |
| parent | 2c90d094d2704b58f2dec434e6cd08427ebaf20a (diff) | |
Merge remote-tracking branch 'dev/11-9-stable' into 11-9-stable
* dev/11-9-stable:
Update VERSION to 11.9.0-rc9
Only return `commands_changes` used in frontend
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/concerns/notes_actions.rb | 2 |
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? |