From: Tom Hughes Date: Sat, 18 Feb 2017 16:18:04 +0000 (+0000) Subject: Fix rubocop warnings X-Git-Tag: live~3597 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/af72cb51e935acff9ac0248ca87a0f43d12e999b?hp=8e6a5c21cb127e00d300707ff8b9a559e8085220 Fix rubocop warnings --- diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d6516dc14..8eb5f2409 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -152,11 +152,11 @@ class ApplicationController < ActionController::Base # have we identified the user? if @user # check if the user has been banned - user_block = @user.blocks.active.take - unless user_block.nil? + user_block = @user.blocks.active.take + unless user_block.nil? set_locale - if user_block.zero_hour? - report_error t("application.setup_user_auth.blocked_zero_hour"), :forbidden + if user_block.zero_hour? + report_error t("application.setup_user_auth.blocked_zero_hour"), :forbidden else report_error t("application.setup_user_auth.blocked"), :forbidden end