diff options
| author | seb <seb@seb-U36JC> | 2011-11-21 13:57:31 +0000 |
|---|---|---|
| committer | seb <seb@seb-U36JC> | 2011-11-21 13:57:31 +0000 |
| commit | 69bcb7fe3fed27f3499654209e65fd627f788aaa (patch) | |
| tree | 2623a37f773d19e7a50d670237ac745deb1b0509 /app/controllers/admin_controller.rb | |
| parent | 9030e9b47ebf52a525728103ab4b2c73f24d674e (diff) | |
| parent | 5128b4348862037139df45da15d4eee314bc710a (diff) | |
Merge branch 'develop' into feature/refactor-css-seb
Diffstat (limited to 'app/controllers/admin_controller.rb')
| -rw-r--r-- | app/controllers/admin_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 0bfbcd3d1..adb506b91 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -53,6 +53,7 @@ class AdminController < ApplicationController authenticate_or_request_with_http_basic do |user_name, password| if user_name == config_username && password == config_password session[:using_admin] = 1 + request.env['REMOTE_USER'] = user_name else request_http_basic_authentication end |