diff options
| author | Jacopo <beschi.jacopo@gmail.com> | 2017-11-14 10:02:39 +0100 |
|---|---|---|
| committer | Jacopo <beschi.jacopo@gmail.com> | 2017-11-16 17:58:29 +0100 |
| commit | 181cd299f9e06223e8338e93b1c318c671ccb1aa (patch) | |
| tree | 0d71dcf3f786496eaa46b9d65ce2626f162015da /app/models/user.rb | |
| parent | f2997af4d5cdec3266d3178edeedc36d4e590062 (diff) | |
| download | gitlab-ce-181cd299f9e06223e8338e93b1c318c671ccb1aa.tar.gz | |
Adds Rubocop rule for line break after guard clause
Adds a rubocop rule (with autocorrect) to ensure line break after guard clauses.
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 ea10e2854d6..5170d87e850 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1119,6 +1119,7 @@ class User < ActiveRecord::Base # override, from Devise::Validatable def password_required? return false if internal? + super end @@ -1136,6 +1137,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 |
