Merge remote-tracking branch 'openstreetmap/pull/1449'

[rails.git] / app / controllers / application_controller.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d6516dc145b03679695ce146d70f97713b3df955..8eb5f240906579f6fdb21fff01a293fc8c0483ea 100644 (file)
--- 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