diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-20 12:19:19 -0700 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-20 12:19:19 -0700 |
| commit | 3d51a6d4351c6a15c92762f5710a967374d0c59b (patch) | |
| tree | 10c5e87e0add51ef0bdcc9be42ac0176907a080c /config | |
| parent | 8ec5fb138dde9937814ac138352177399d3e776d (diff) | |
| parent | 8819007c83fdf1ac642836640a37cc541f6eddc6 (diff) | |
| download | gitlab-ce-3d51a6d4351c6a15c92762f5710a967374d0c59b.tar.gz | |
Merge branch 'master' into reply-by-email
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 1 | ||||
| -rw-r--r-- | config/routes.rb | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 654de6238d0..bd26ac1da20 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -148,6 +148,7 @@ Settings.gitlab.default_projects_features['snippets'] = false if Settings. Settings.gitlab.default_projects_features['visibility_level'] = Settings.send(:verify_constant, Gitlab::VisibilityLevel, Settings.gitlab.default_projects_features['visibility_level'], Gitlab::VisibilityLevel::PRIVATE) Settings.gitlab['repository_downloads_path'] = File.absolute_path(Settings.gitlab['repository_downloads_path'] || 'tmp/repositories', Rails.root) Settings.gitlab['restricted_signup_domains'] ||= [] +Settings.gitlab['import_sources'] ||= ['github','bitbucket','gitlab','gitorious','google_code','git'] # # Reply by email diff --git a/config/routes.rb b/config/routes.rb index 1166a4b3eba..d7307a61ede 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -463,8 +463,8 @@ Gitlab::Application.routes.draw do member do get :diffs get :commits - post :automerge - get :automerge_check + post :merge + get :merge_check get :ci_status post :toggle_subscription end |