diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-11-20 09:22:14 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-20 09:22:14 +0000 |
| commit | 4f09d099e9fa29659917f87c2dc25f2b9aa05b5e (patch) | |
| tree | a70a9b3d42c8d3762974d354b31aa611590f55b8 /app/models/user.rb | |
| parent | 135437b70d5bf12fff17d10adeae0c459b779138 (diff) | |
| parent | 181cd299f9e06223e8338e93b1c318c671ccb1aa (diff) | |
| download | gitlab-ce-4f09d099e9fa29659917f87c2dc25f2b9aa05b5e.tar.gz | |
Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'
Adds Rubocop rule for line break after guard clause
Closes #18040
See merge request gitlab-org/gitlab-ce!15188
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 71c34766451..0329d094d09 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1125,6 +1125,7 @@ class User < ActiveRecord::Base # override, from Devise::Validatable def password_required? return false if internal? + super end @@ -1142,6 +1143,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 # rubocop:disable GitlabSecurity/PublicSend end |