diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-25 10:27:27 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-25 10:27:27 +0100 |
| commit | df6e17e48995f25e72509986f30700d778b179b6 (patch) | |
| tree | f432c24b8e4ad81009188650dabfd99194883265 /app/controllers/application_controller.rb | |
| parent | 11f186a118285fbc87a536af26730780a9ad01f5 (diff) | |
| parent | cce94a74aa5c9691f9b37cd9be5a6831f8063812 (diff) | |
Merge branch 'develop'5.1.2
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d1d918e..12bea54 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -110,6 +110,10 @@ class ApplicationController < ActionController::Base redirect_to log_in_path, :alert => 'Access denied! You need to login first.' end end + + def request_remote_ip + request.env['HTTP_X_FORWARDED_FOR'] || request.remote_ip + end private |