diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-14 14:01:17 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-14 14:01:17 +0200 |
commit | 81560ab259b07a65fd1bf9b51cff2e1dd1ea2974 (patch) | |
tree | c2ebc9ed390261bf56778df438aca2d67384f4ea /app/helpers/ci | |
parent | d0019456cdcbcce6cb9de6fd8b6e033950f1a5bd (diff) | |
download | gitlab-ce-81560ab259b07a65fd1bf9b51cff2e1dd1ea2974.tar.gz |
Fix build triggers URL and slack notifications
Diffstat (limited to 'app/helpers/ci')
-rw-r--r-- | app/helpers/ci/routes_helper.rb | 4 | ||||
-rw-r--r-- | app/helpers/ci/triggers_helper.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/ci/routes_helper.rb b/app/helpers/ci/routes_helper.rb index 299a96edee4..42cd54b064f 100644 --- a/app/helpers/ci/routes_helper.rb +++ b/app/helpers/ci/routes_helper.rb @@ -13,11 +13,11 @@ module Ci end def url_helpers - @url_helpers ||= Ci::Base.new + @url_helpers ||= Base.new end def self.method_missing(method, *args, &block) - @url_helpers ||= Ci::Base.new + @url_helpers ||= Base.new if @url_helpers.respond_to?(method) @url_helpers.send(method, *args, &block) diff --git a/app/helpers/ci/triggers_helper.rb b/app/helpers/ci/triggers_helper.rb index 0d62bbf36b8..0d2438928ce 100644 --- a/app/helpers/ci/triggers_helper.rb +++ b/app/helpers/ci/triggers_helper.rb @@ -1,6 +1,6 @@ module Ci module TriggersHelper - def build_trigger_url(project_id, ref_name) + def ci_build_trigger_url(project_id, ref_name) "#{Settings.gitlab_ci.url}/ci/api/v1/projects/#{project_id}/refs/#{ref_name}/trigger" end end |