diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2018-05-03 11:52:51 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-05-03 11:52:51 +0300 |
| commit | 5a7fbb8d89404f27a4467db7f2c619cc56f91142 (patch) | |
| tree | 4472ec6b13e5d3d337d338e21e3bf7fc9036d0b1 /app/models/merge_request.rb | |
| parent | 38a5bcd1ccad1a2f80c82f03cd0c5b991af8abdd (diff) | |
[Rails5] Fix params passed to MergeWorker
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 8f964a488aa..63c6ada86e1 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -323,7 +323,7 @@ class MergeRequest < ActiveRecord::Base # updates `merge_jid` with the MergeWorker#jid. # This helps tracking enqueued and ongoing merge jobs. def merge_async(user_id, params) - jid = MergeWorker.perform_async(id, user_id, params) + jid = MergeWorker.perform_async(id, user_id, params.to_h) update_column(:merge_jid, jid) end |