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

@ -147,7 +147,7 @@ class Registrar::SessionsController < Devise::SessionsController
def check_ip
return if Rails.env.development?
return if WhiteIp.registrar_ip_white?(request.ip)
render text: t('ip_is_not_whitelisted') and return
render text: t('access_denied') and return
end
def role_base_root_url(user)