diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-12-20 12:02:21 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-12-20 12:02:21 +0000 |
commit | d318075abac822b657e37912e049b8d8958b189a (patch) | |
tree | 131ca827a64ee86a6f5aeca5850061c1ec7395c6 /app/services/quick_actions/interpret_service.rb | |
parent | febb0b9a8014f5b480ff7baab1d189fce49210a5 (diff) | |
parent | 099e274266f7c63ec43b02d79577a74265feb67c (diff) | |
download | gitlab-ce-d318075abac822b657e37912e049b8d8958b189a.tar.gz |
Merge branch 'rs-blocks-json-serialization' into 'master'
Add BlocksJsonSerialization model concern and include it in User
Closes #37947
See merge request gitlab-org/gitlab-ce!14350
Diffstat (limited to 'app/services/quick_actions/interpret_service.rb')
-rw-r--r-- | app/services/quick_actions/interpret_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/quick_actions/interpret_service.rb b/app/services/quick_actions/interpret_service.rb index 06ac86cd5a9..669c1ba0a22 100644 --- a/app/services/quick_actions/interpret_service.rb +++ b/app/services/quick_actions/interpret_service.rb @@ -405,7 +405,7 @@ module QuickActions if time_spent @updates[:spend_time] = { duration: time_spent, - user: current_user, + user_id: current_user.id, spent_at: time_spent_date } end @@ -428,7 +428,7 @@ module QuickActions current_user.can?(:"admin_#{issuable.to_ability_name}", project) end command :remove_time_spent do - @updates[:spend_time] = { duration: :reset, user: current_user } + @updates[:spend_time] = { duration: :reset, user_id: current_user.id } end desc "Append the comment with #{SHRUG}" |