diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-07-08 16:45:13 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-07-08 16:45:13 +0200 |
| commit | 9436dca4ed72e0e5bb36f5444ddeb5de9b346c03 (patch) | |
| tree | 3757286967a44e89f9e3e76231e6d44ba2265bb6 /config | |
| parent | 00b6536f4d155ec41b8a8434d992b6b207f07bb5 (diff) | |
| download | gitlab-ci-9436dca4ed72e0e5bb36f5444ddeb5de9b346c03.tar.gz | |
Make configurable builds_path in application.ymlbuilds-path
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.yml.example | 3 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config/application.yml.example b/config/application.yml.example index 8d345b3..d86f68b 100644 --- a/config/application.yml.example +++ b/config/application.yml.example @@ -29,6 +29,9 @@ defaults: &defaults # Add pusher to recipients list (default: false) # add_pusher: true + # The location where build traces are stored (default: builds/). Relative paths are relative to Rails.root + # builds_path: builds/ + gravatar: enabled: true plain_url: "http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm" diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index dbe4fa1..a8f1107 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -40,6 +40,7 @@ Settings.gitlab_ci['support_email'] ||= Settings.gitlab_ci.email_from Settings.gitlab_ci['all_broken_builds'] = true if Settings.gitlab_ci['all_broken_builds'].nil? Settings.gitlab_ci['add_pusher'] = false if Settings.gitlab_ci['add_pusher'].nil? Settings.gitlab_ci['url'] ||= Settings.send(:build_gitlab_ci_url) +Settings.gitlab_ci['builds_path'] = File.expand_path(Settings.gitlab_ci['builds_path'] || "builds/", Rails.root) # Compatibility with old config Settings['gitlab_server_urls'] ||= Settings['allowed_gitlab_urls'] |