diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-18 10:19:08 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-18 12:46:47 +0200 |
| commit | e41a29b0c381458f789d62cfeb9ad94920f78804 (patch) | |
| tree | a4fc62468ad98fdff7b475906acf4ef048c209a4 /config | |
| parent | 1eb3dde45b55afb723954e577b7bd12946aeb3ca (diff) | |
| download | gitlab-ce-e41a29b0c381458f789d62cfeb9ad94920f78804.tar.gz | |
Allow to disable GitLab CI
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 1 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index fe81ffd4205..274e3d409fb 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -178,6 +178,7 @@ 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) diff --git a/config/routes.rb b/config/routes.rb index b5a84c1f192..c3b9475146d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -12,7 +12,7 @@ Gitlab::Application.routes.draw do resources :projects do collection do post :add - get :gitlab + get :disabled end member do |