diff options
| author | Alex Hanselka <alex@gitlab.com> | 2019-03-20 20:56:40 +0000 |
|---|---|---|
| committer | Alex Hanselka <alex@gitlab.com> | 2019-03-20 20:56:40 +0000 |
| commit | d8dfd330de71e54633995103103b0a6573ae298c (patch) | |
| tree | f3ea51273302672c2fdb1bc9090e89c19a99f2eb /app/controllers | |
| parent | 37bd7aa6beffd1567dadcb4fff8167d050deabd8 (diff) | |
| parent | 3d85406734fc31bb9c9fb95ce26898b65b60b3ea (diff) | |
| download | gitlab-ce-d8dfd330de71e54633995103103b0a6573ae298c.tar.gz | |
Merge branch 'security-2826-fix-project-serialization-in-quick-actions' into 'master'
Fix project serialization in quick actions response
Closes #2826
See merge request gitlab/gitlabhq!3001
Diffstat (limited to 'app/controllers')
| -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? |