Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-09-10 13:42:41 +0300
committerValery Sizov <vsv2711@gmail.com>2015-09-10 13:42:41 +0300
commit381180bc27b7c4f0d54ca4a1599ad5d857a2086e (patch)
tree7fd9a727f7dccdc02648973d070c4eb1fa8fae6f /app/helpers
parent44261a5d9fd5b78f8a44fe330e2386525f4c3437 (diff)
remove gitlab_ci config
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/ci/routes_helper.rb6
-rw-r--r--app/helpers/ci/triggers_helper.rb2
2 files changed, 4 insertions, 4 deletions
diff --git a/app/helpers/ci/routes_helper.rb b/app/helpers/ci/routes_helper.rb
index f22d5023db5..299a96edee4 100644
--- a/app/helpers/ci/routes_helper.rb
+++ b/app/helpers/ci/routes_helper.rb
@@ -5,9 +5,9 @@ module Ci
def default_url_options
{
- host: Ci::Settings.gitlab_ci['host'],
- protocol: Ci::Settings.gitlab_ci['https'] ? "https" : "http",
- port: Ci::Settings.gitlab_ci['port']
+ host: Settings.gitlab['host'],
+ protocol: Settings.gitlab['https'] ? "https" : "http",
+ port: Settings.gitlab['port']
}
end
end
diff --git a/app/helpers/ci/triggers_helper.rb b/app/helpers/ci/triggers_helper.rb
index caff54c3520..0d62bbf36b8 100644
--- a/app/helpers/ci/triggers_helper.rb
+++ b/app/helpers/ci/triggers_helper.rb
@@ -1,7 +1,7 @@
module Ci
module TriggersHelper
def build_trigger_url(project_id, ref_name)
- "#{Ci::Settings.gitlab_ci.url}/api/v1/projects/#{project_id}/refs/#{ref_name}/trigger"
+ "#{Settings.gitlab_ci.url}/ci/api/v1/projects/#{project_id}/refs/#{ref_name}/trigger"
end
end
end