diff options
| author | Matthew Landauer <matthew@openaustralia.org> | 2013-02-24 10:10:03 +1100 |
|---|---|---|
| committer | Matthew Landauer <matthew@openaustralia.org> | 2013-02-24 10:54:42 +1100 |
| commit | 0d78ef90a85d11a0bd5d9c092292c829968470ab (patch) | |
| tree | 082938723961aaa7de42918a07999005cd57dccf | |
| parent | 2a193d3bc74b812bd9ddee9d7520ca1e98007511 (diff) | |
Extract method
| -rw-r--r-- | app/controllers/admin_general_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/application_controller.rb | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/admin_general_controller.rb b/app/controllers/admin_general_controller.rb index 9f4c398c1..96b67d389 100644 --- a/app/controllers/admin_general_controller.rb +++ b/app/controllers/admin_general_controller.rb @@ -121,7 +121,7 @@ class AdminGeneralController < AdminController def debug @admin_current_user = admin_current_user - @current_commit = `git log -1 --format="%H"` + @current_commit = alaveteli_git_commit @current_branch = `git branch | perl -ne 'print $1 if /^\\* (.*)/'` @current_version = `git describe --always --tags` repo = `git remote show origin -n | perl -ne 'print $1 if m{Fetch URL: .*github\\.com[:/](.*)\\.git}'` diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index f3deeb64a..f5d6cbf18 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -562,6 +562,11 @@ class ApplicationController < ActionController::Base def set_popup_banner @popup_banner = render_to_string(:partial => "general/popup_banner").strip.html_safe end + + def alaveteli_git_commit + `git log -1 --format="%H"`.strip + end + # URL generating functions are needed by all controllers (for redirects), # views (for links) and mailers (for use in emails), so include them into # all of all. |