diff options
author | Matthew Landauer <matthew@openaustralia.org> | 2013-02-19 13:02:48 +1100 |
---|---|---|
committer | Matthew Landauer <matthew@openaustralia.org> | 2013-02-25 16:26:52 +1100 |
commit | e31d002858e9dd6b790285ce21f35ca1ae8fa72c (patch) | |
tree | 7fa6ea917c7e4c1c24e1c9488d954f9b7d4a461d /app/views/admin_general/debug.rhtml | |
parent | 2a193d3bc74b812bd9ddee9d7520ca1e98007511 (diff) |
Merge in adminbootstraptheme 323d704ab4f1ffe31f20fcabeaf030c462dfbadf into main project
Diffstat (limited to 'app/views/admin_general/debug.rhtml')
-rw-r--r-- | app/views/admin_general/debug.rhtml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/views/admin_general/debug.rhtml b/app/views/admin_general/debug.rhtml index b0749bedb..7fd256025 100644 --- a/app/views/admin_general/debug.rhtml +++ b/app/views/admin_general/debug.rhtml @@ -2,14 +2,18 @@ <h1><%=@title%></h1> -<p>You are <%= h @admin_current_user %></p> +<p>You are <%= h @http_auth_user %></p> <h2>Version numbers</h2> <p> Alaveteli version: <%= link_to @current_version, @github_origin + @current_version %> <br> -Alaveteli branch: <%= link_to @current_branch, @github_origin + @current_branch %> +<% if @current_branch == "(no branch)" %> + Alaveteli branch: (no branch) +<% else %> + Alaveteli branch: <%= link_to @current_branch, @github_origin + @current_branch %> +<% end %> <br> Alaveteli commit: <%= link_to @current_commit, @github_origin + @current_commit %> <br> |