diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-05-02 10:50:54 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-05-02 10:50:54 +0300 |
| commit | 83e0395190bd189e68ae51bdc7c5c76e81f99bab (patch) | |
| tree | 9a59542386d38802366814736b08f1eed39271f2 | |
| parent | 22c45a9ee71c687b240a78c2cb154d90550b1430 (diff) | |
| parent | 34a3e165d5419ed364d59d1fb93cb0de6aba154f (diff) | |
Merge branch 'blackst0ne-rails5-fix-delete-user-worker' into 'master'
[Rails5] Fix `params` for DeleteUserWorker
See merge request gitlab-org/gitlab-ce!18635
| -rw-r--r-- | Gemfile.rails5.lock | 11 | ||||
| -rw-r--r-- | app/models/user.rb | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index a0330cbdd02..10d5cb6a23f 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -304,12 +304,12 @@ GEM flowdock (~> 0.7) gitlab-grit (>= 2.4.1) multi_json - gitlab-gollum-lib (4.2.7.1) + gitlab-gollum-lib (4.2.7.2) gemojione (~> 3.2) github-markup (~> 1.6) gollum-grit_adapter (~> 1.0) nokogiri (>= 1.6.1, < 2.0) - rouge (~> 2.1) + rouge (~> 3.1) sanitize (~> 2.1) stringex (~> 2.6) gitlab-gollum-rugged_adapter (0.4.4) @@ -602,8 +602,6 @@ GEM atomic (>= 1.0.0) mysql2 peek - peek-performance_bar (1.3.1) - peek (>= 0.1.0) peek-pg (1.3.0) concurrent-ruby concurrent-ruby-ext @@ -752,7 +750,7 @@ GEM retriable (3.1.1) rinku (2.0.4) rotp (2.1.2) - rouge (2.2.1) + rouge (3.1.1) rqrcode (0.10.1) chunky_png (~> 1.0) rqrcode-rails3 (0.1.7) @@ -1134,7 +1132,6 @@ DEPENDENCIES peek (~> 1.0.1) peek-gc (~> 0.0.2) peek-mysql2 (~> 1.1.0) - peek-performance_bar (~> 1.3.0) peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) @@ -1166,7 +1163,7 @@ DEPENDENCIES redis-rails (~> 5.0.2) request_store (~> 1.3) responders (~> 2.0) - rouge (~> 2.0) + rouge (~> 3.1) rqrcode-rails3 (~> 0.1.7) rspec-parameterized rspec-rails (~> 3.6.0) diff --git a/app/models/user.rb b/app/models/user.rb index b0668148972..4a602ffbb05 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -910,7 +910,7 @@ class User < ActiveRecord::Base def delete_async(deleted_by:, params: {}) block if params[:hard_delete] - DeleteUserWorker.perform_async(deleted_by.id, id, params) + DeleteUserWorker.perform_async(deleted_by.id, id, params.to_h) end def notification_service |