DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Enable the Layout/TrailingWhitespace cop

Browse source
This commit is contained in:
gregoirenovel 2018-01-15 22:13:52 +01:00
parent 2df14691e7
commit 813844f9db
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.rubocop.yml
View file

@ -234,7 +234,7 @@ Layout/TrailingBlankLines:
Enabled: true Enabled: true
Layout/TrailingWhitespace: Layout/TrailingWhitespace:
Enabled: false Enabled: true
Lint/AmbiguousBlockAssociation: Lint/AmbiguousBlockAssociation:
Enabled: false Enabled: false

4
app/models/administrateur.rb
View file

@ -43,9 +43,9 @@ class Administrateur < ActiveRecord::Base
if active? if active?
raise "Impossible d'inviter un utilisateur déjà actif !" raise "Impossible d'inviter un utilisateur déjà actif !"
end end
reset_password_token = set_reset_password_token reset_password_token = set_reset_password_token
AdministrationMailer.invite_admin(self, reset_password_token).deliver_now! AdministrationMailer.invite_admin(self, reset_password_token).deliver_now!
reset_password_token reset_password_token

2
app/models/administration.rb
View file

@ -10,7 +10,7 @@ class Administration < ActiveRecord::Base
def invite_admin(email) def invite_admin(email)
administrateur = Administrateur.new({ administrateur = Administrateur.new({
email: email, email: email,
active: false active: false
}) })
administrateur.password = administrateur.password_confirmation = SecureRandom.hex administrateur.password = administrateur.password_confirmation = SecureRandom.hex