cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix rubocop warnings

Browse source
This commit is contained in:
Simon Poole 2016-08-19 09:23:31 +02:00
parent 0837205d02
commit c6fe828286
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/user_controller.rb
View file

@ -297,9 +297,7 @@ class UserController < ApplicationController
user = token.user user = token.user
user.status = "active" user.status = "active"
user.email_valid = true user.email_valid = true
if (gravatar_enable(user)) flash[:notice] = gravatar_status_message(user) if gravatar_enable(user)
flash[:notice] = gravatar_status_message(user)
end
user.save! user.save!
referer = token.referer referer = token.referer
token.destroy token.destroy
@ -353,7 +351,7 @@ class UserController < ApplicationController
@user.email_valid = true @user.email_valid = true
changed = gravatar_enable(@user) changed = gravatar_enable(@user)
if @user.save if @user.save
flash[:notice] = (t "user.confirm_email.success") + (changed ? " " + gravatar_status_message(@user) : "") flash[:notice] = (t "user.confirm_email.success") + (changed ? " " + gravatar_status_message(@user) : "")
else else
flash[:errors] = @user.errors flash[:errors] = @user.errors
end end
@ -814,7 +812,7 @@ class UserController < ApplicationController
response = OSM.http_client.get(URI.parse(url)) response = OSM.http_client.get(URI.parse(url))
oldsetting = user.image_use_gravatar oldsetting = user.image_use_gravatar
user.image_use_gravatar = response.success? user.image_use_gravatar = response.success?
return oldsetting != user.image_use_gravatar oldsetting != user.image_use_gravatar
end end
## ##