diff options
author | Louise Crow <louise.crow@gmail.com> | 2013-03-06 15:14:08 -0800 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2013-03-06 15:14:08 -0800 |
commit | 455a1f07f3099d1d94fff2a7efcf99fb8fd6841d (patch) | |
tree | d2b6603b99104a99443d230f01115b0626050c91 /app/views/admin_general/debug.rhtml | |
parent | bda2645de69bfee361280c4bfe3dc1bef8aa330d (diff) | |
parent | b8388eeb637476cfc2e9ec9ee791cab341e76f95 (diff) |
Merge remote-tracking branch 'openaustralia_github/merge_adminbootstrap_theme' into develop
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> |