Merge branch 'wdtk' into develop

2 files changed, 4 insertions, 6 deletions

diff --git a/app/controllers/admin_general_controller.rb b/app/controllers/admin_general_controller.rb
index c83ae0f37..2c961dfc5 100644
--- a/app/controllers/admin_general_controller.rb
+++ b/app/controllers/admin_general_controller.rb
@@ -79,11 +79,12 @@ class AdminGeneralController < AdminController
     end
 
     def debug
+        @http_auth_user = admin_http_auth_user
         @current_commit = `git log -1 --format="%H"`
-        @current_branch = `git branch | grep "\*" | awk '{print $2}'`
+        @current_branch = `git branch | perl -ne 'print $1 if /^\\* (.*)/'`
         @current_version = `git describe --always --tags`
-        repo = `git remote show origin -n | grep Fetch | awk '{print $3}' | sed -re 's/.*:(.*).git/\\1/'`
-        @github_origin = "https://github.com/#{repo.strip}/tree/"
+        repo = `git remote show origin -n | perl -ne 'print $1 if m{Fetch URL: .*github\\.com[:/](.*)\\.git}'`
+        @github_origin = "https://github.com/#{repo}/tree/"
         @request_env = request.env
     end
 end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 82884f6c3..41adf1848 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -345,9 +345,6 @@ class ApplicationController < ActionController::Base
             return "*unknown*";
         end
     end
-    def assign_http_auth_user
-        @http_auth_user = admin_http_auth_user
-    end
 
     # Convert URL name for sort by order, to Xapian query
     def order_to_sort_by(sortby)