Merge branch 'master' of github.com:domify/registry

This commit is contained in:
Priit Tark 2015-05-20 21:00:03 +03:00
commit 17bf5c373e
9 changed files with 30 additions and 11 deletions

View file

@ -18,7 +18,7 @@ class RegistrarController < ApplicationController
end
return if Rails.env.development?
return if current_user.registrar.registrar_ip_white?(request.ip)
flash[:alert] = t('ip_is_not_whitelisted')
flash[:alert] = t('access_denied')
sign_out(current_user)
redirect_to registrar_login_path and return
end