diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-10-05 21:06:31 +0300 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-10-05 21:06:31 +0300 |
| commit | f088ffe8f7a8b9ef429f2fb0fbdfd45fa37cde20 (patch) | |
| tree | d3bf78bcd464177800cfd466f9ebda114e8d8a71 /config | |
| parent | 3eef0e18e0d4561c320b4a5d9c17d7ae7aaa3d42 (diff) | |
| parent | fc59c45d58124c4fc23d62ad2ed65cbfd6cb3563 (diff) | |
Merge branch 'rs-remove-ci-disable'
See merge request !1512
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 4e4a8ecbdb3..4c78bd6e2fa 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -178,7 +178,6 @@ Settings.gitlab['import_sources'] ||= ['github','bitbucket','gitlab','gitorious' # CI # Settings['gitlab_ci'] ||= Settingslogic.new({}) -Settings.gitlab_ci['enabled'] = true if Settings.gitlab_ci['enabled'].nil? 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) |