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

1 files changed, 9 insertions, 0 deletions

diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index 15f5df840..939dd1739 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -214,5 +214,14 @@ class GeneralController < ApplicationController
         raise RouteNotFound
     end
 
+    def version
+        respond_to do |format|
+            format.json { render :json => {
+                :alaveteli_git_commit => alaveteli_git_commit,
+                :alaveteli_version => ALAVETELI_VERSION,
+                :ruby_version => RUBY_VERSION
+            }}
+        end
+    end
 end