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/models/ci | |
| parent | 44261a5d9fd5b78f8a44fe330e2386525f4c3437 (diff) | |
| download | gitlab-ce-381180bc27b7c4f0d54ca4a1599ad5d857a2086e.tar.gz | |
remove gitlab_ci config
Diffstat (limited to 'app/models/ci')
| -rw-r--r-- | app/models/ci/application_setting.rb | 4 | ||||
| -rw-r--r-- | app/models/ci/build.rb | 2 | ||||
| -rw-r--r-- | app/models/ci/project.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/models/ci/application_setting.rb b/app/models/ci/application_setting.rb index 0ea2452e392..0cf496f7d81 100644 --- a/app/models/ci/application_setting.rb +++ b/app/models/ci/application_setting.rb @@ -19,8 +19,8 @@ module Ci def self.create_from_defaults create( - all_broken_builds: Ci::Settings.gitlab_ci['all_broken_builds'], - add_pusher: Ci::Settings.gitlab_ci['add_pusher'], + all_broken_builds: Settings.gitlab_ci['all_broken_builds'], + add_pusher: Settings.gitlab_ci['add_pusher'], ) end end diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 64e7a600672..8096d4fa5ae 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -244,7 +244,7 @@ module Ci def dir_to_trace File.join( - Ci::Settings.gitlab_ci.builds_path, + Settings.gitlab_ci.builds_path, created_at.utc.strftime("%Y_%m"), project.id.to_s ) diff --git a/app/models/ci/project.rb b/app/models/ci/project.rb index dceca7a275a..9c9198302f6 100644 --- a/app/models/ci/project.rb +++ b/app/models/ci/project.rb @@ -211,7 +211,7 @@ module Ci end def gitlab_url - File.join(GitlabCi.config.gitlab_server.url, path) + File.join(Gitlab.config.gitlab.url, path) end def setup_finished? |