diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-06-18 15:17:34 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-06-18 15:17:34 -0700 |
| commit | 45d0869d578e6f915efc50b8a500b7c0319ebc6e (patch) | |
| tree | ec34da134ee42348d39b2032dfe8ef427383a27c /app/controllers/admin_general_controller.rb | |
| parent | 60beb580aa7c74ef82666a29bc19ddb5c76f1042 (diff) | |
| parent | 4f62bb900996dba5fa1c71ad688ffb2839983662 (diff) | |
Merge remote-tracking branch 'openaustralia_github/app_version_api_feature' into rails-3-develop
Conflicts:
app/controllers/application_controller.rb
app/controllers/general_controller.rb
config/routes.rb
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 b64fcac3e..ec5f95eda 100644 --- a/app/controllers/admin_general_controller.rb +++ b/app/controllers/admin_general_controller.rb @@ -134,7 +134,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}'` |