diff options
| author | Alex Hanselka <alex@gitlab.com> | 2019-03-20 23:57:19 +0300 |
|---|---|---|
| committer | Alex Hanselka <alex@gitlab.com> | 2019-03-20 23:57:19 +0300 |
| commit | c7fc0bf5319aacfc8d8f399202e2f0785d844fcc (patch) | |
| tree | 6f5ff6e5a10a322e64c25a3128eb542fc7c04c82 /app | |
| parent | fbc49fa332fb2302b13a556af02efcc18b3e004d (diff) | |
| parent | d8dfd330de71e54633995103103b0a6573ae298c (diff) | |
Merge remote-tracking branch 'dev/master'
* dev/master:
Update CHANGELOG.md for 11.8.3
Update CHANGELOG.md for 11.7.7
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? |