diff options
| author | John Jarvis <jarv@gitlab.com> | 2019-03-20 10:45:18 +0000 |
|---|---|---|
| committer | John Jarvis <jarv@gitlab.com> | 2019-03-20 10:45:18 +0000 |
| commit | 9c529aec64256d3ddf5cd0d1835da6a8b090f7c1 (patch) | |
| tree | 7b22244605aa8bb5a5f783b1dfa746367e9ab971 /app | |
| parent | 8436b72f4641f1e1de7fd08c91e63e6fe73e54d9 (diff) | |
| parent | df53080d37701e341d282721d5ae368fa97cea9a (diff) | |
| download | gitlab-ce-9c529aec64256d3ddf5cd0d1835da6a8b090f7c1.tar.gz | |
Merge branch 'security-11-9-2826-fix-project-serialization-in-quick-actions' into '11-9-stable'
Fix project serialization in quick actions response
See merge request gitlab/gitlabhq!3015
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? |