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

Conflicts:
	app/controllers/epp/sessions_controller.rb
This commit is contained in:
Martin Lensment 2015-06-29 11:14:19 +03:00
commit f20113bf9f
40 changed files with 337 additions and 251 deletions

View file

@ -8,6 +8,7 @@ class Epp::SessionsController < EppController
# rubocop: disable Metrics/PerceivedComplexity
# rubocop: disable Metrics/CyclomaticComplexity
# rubocop: disable Metrics/MethodLength
# rubocop: disable Metrics/AbcSize
def login
success = true
@api_user = ApiUser.find_by(login_params)
@ -56,6 +57,9 @@ class Epp::SessionsController < EppController
end
end
# rubocop: enable Metrics/MethodLength
# rubocop: enable Metrics/AbcSize
# rubocop: enable Metrics/PerceivedComplexity
# rubocop: enable Metrics/CyclomaticComplexity
def ip_white?
return true if request.ip == ENV['webclient_ip']
@ -75,9 +79,6 @@ class Epp::SessionsController < EppController
true
end
# rubocop: enable Metrics/PerceivedComplexity
# rubocop: enable Metrics/CyclomaticComplexity
def logout
@api_user = current_user # cache current_user for logging
epp_session.destroy