diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-31 09:34:00 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-31 09:34:00 +0000 |
| commit | 8c8fd338a5ea811040afe3f837e2f9a826eaa1a0 (patch) | |
| tree | 0df5d15ee7581c7fca7c56a36f517a9d1b29dd72 /app/controllers/admin_general_controller.rb | |
| parent | deaede70df7cf68f380e00f01950b48c0e73a4fa (diff) | |
| parent | e19b4494d1a8901ab60dd5ea7fa116d7c799a92b (diff) | |
Merge branch 'feature/flexible-admin-username' into develop
Diffstat (limited to 'app/controllers/admin_general_controller.rb')
| -rw-r--r-- | app/controllers/admin_general_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin_general_controller.rb b/app/controllers/admin_general_controller.rb index 5176eb8db..9f4c398c1 100644 --- a/app/controllers/admin_general_controller.rb +++ b/app/controllers/admin_general_controller.rb @@ -120,7 +120,7 @@ class AdminGeneralController < AdminController end def debug - @http_auth_user = admin_http_auth_user + @admin_current_user = admin_current_user @current_commit = `git log -1 --format="%H"` @current_branch = `git branch | perl -ne 'print $1 if /^\\* (.*)/'` @current_version = `git describe --always --tags` |