From 4ce2b4b3f95520fa9e8e4d79d7b0e345c25a0627 Mon Sep 17 00:00:00 2001 From: Cyril Date: Mon, 26 Nov 2012 03:28:52 +0100 Subject: [PATCH] use root_url instead of application_helper#web_app_url --- app/helpers/application_helper.rb | 8 -------- app/views/admin/groups/_form.html.haml | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index bebac0f714b..5ce7ab62466 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -40,14 +40,6 @@ module ApplicationHelper end end - def request_protocol - request.ssl? ? "https" : "http" - end - - def web_app_url - "#{request_protocol}://#{Gitlab.config.web_host}/" - end - def last_commit(project) if project.repo_exists? time_ago_in_words(project.commit.committed_date) + " ago" diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml index 40d361b0402..5af22392304 100644 --- a/app/views/admin/groups/_form.html.haml +++ b/app/views/admin/groups/_form.html.haml @@ -12,7 +12,7 @@ URL .input .input-prepend - %span.add-on= web_app_url + 'groups/' + %span.add-on= root_url + 'groups/' = f.text_field :path, placeholder: "example" .form-actions -- GitLab