diff options
| author | Robin Houston <robin.houston@gmail.com> | 2011-12-04 22:53:43 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2011-12-04 22:53:43 +0000 |
| commit | 40f0d929727694eba21c934cb3732574cf84f6b6 (patch) | |
| tree | f4995e43c897bda5a5d878dbdc6df3fb65eddf97 /app/controllers/admin_controller.rb | |
| parent | fe6d2c7a1609d9088c136762d7d89f7dc01a21ea (diff) | |
| parent | 00caf911d7b60cbd3dea0ec070321b5b6aa6a79d (diff) | |
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop
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 |