diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-09-10 13:42:41 +0300 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-09-10 13:42:41 +0300 |
| commit | 381180bc27b7c4f0d54ca4a1599ad5d857a2086e (patch) | |
| tree | 7fd9a727f7dccdc02648973d070c4eb1fa8fae6f /app/mailers | |
| parent | 44261a5d9fd5b78f8a44fe330e2386525f4c3437 (diff) | |
| download | gitlab-ce-381180bc27b7c4f0d54ca4a1599ad5d857a2086e.tar.gz | |
remove gitlab_ci config
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/ci/notify.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/mailers/ci/notify.rb b/app/mailers/ci/notify.rb index 44e490e9b36..6dcc118ac05 100644 --- a/app/mailers/ci/notify.rb +++ b/app/mailers/ci/notify.rb @@ -5,10 +5,10 @@ module Ci add_template_helper Ci::ApplicationHelper add_template_helper Ci::GitlabHelper - default_url_options[:host] = GitlabCi.config.gitlab_ci.host - default_url_options[:protocol] = GitlabCi.config.gitlab_ci.protocol - default_url_options[:port] = GitlabCi.config.gitlab_ci.port if GitlabCi.config.gitlab_ci_on_non_standard_port? - default_url_options[:script_name] = GitlabCi.config.gitlab_ci.relative_url_root + default_url_options[:host] = Gitlab.config.gitlab.host + default_url_options[:protocol] = Gitlab.config.gitlab.protocol + default_url_options[:port] = Gitlab.config.gitlab.port unless Gitlab.config.gitlab_on_standard_port? + default_url_options[:script_name] = Gitlab.config.gitlab.relative_url_root default from: GitlabCi.config.gitlab_ci.email_from |