diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-06-26 11:13:38 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-06-26 11:13:38 -0700 |
| commit | 411aee219e14fe3d942699f230f7a8e3ed70bfe0 (patch) | |
| tree | cbd41460afc2f0e24d7490d3034eee2544f3bac5 /app/controllers/admin_general_controller.rb | |
| parent | 9ccc03bc7d4c4e9064a9217d6e332abfb3f15b7f (diff) | |
| parent | 0d9de53bdccf20cc2884f0ad896d5e9dd2edee03 (diff) | |
Merge branch 'release/0.12' into wdtk
Conflicts:
locale/he_IL/app.po
locale/hr_HR/app.po
locale/nb_NO/app.po
locale/uk/app.po
spec/models/info_request_spec.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}'` |