diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-08-16 14:25:26 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-08-16 14:25:26 +0300 |
| commit | fcce6c3168dbd04404f318b4e983d7395d21538c (patch) | |
| tree | d8155d729f0915f6117bbe1f4010fffec9d37e56 /app/models/user.rb | |
| parent | 9ac2a517798af2f942b28138403690afc20a254c (diff) | |
| parent | 260c8da060a6039cbd47cfe31c8ec6d6f9b43de0 (diff) | |
Merge branch 'rs-more-public-send-whitelists' into 'master'
Whitelist or fix additional `Gitlab/PublicSend` cop violations
See merge request !13467
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 2b25736bb26..0e2654ff757 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1070,7 +1070,7 @@ class User < ActiveRecord::Base # Added according to https://github.com/plataformatec/devise/blob/7df57d5081f9884849ca15e4fde179ef164a575f/README.md#activejob-integration def send_devise_notification(notification, *args) return true unless can?(:receive_notifications) - devise_mailer.send(notification, self, *args).deliver_later + devise_mailer.__send__(notification, self, *args).deliver_later # rubocop:disable GitlabSecurity/PublicSend end # This works around a bug in Devise 4.2.0 that erroneously causes a user to |