diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-16 15:06:26 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-16 15:06:26 +0300 |
| commit | d2798d607e11e0ebae83ae909404834388733428 (patch) | |
| tree | 096b7f4d4bdb315d28cdcd4d6db4e80911112e9c /config | |
| parent | d8211a0ed119eada7d292e974a8fc7b0cd982d3c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 4 | ||||
| -rw-r--r-- | config/initializers/8_devise.rb | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 92674aafa90..814ea551e19 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -982,6 +982,10 @@ production: &base # Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app). # secret_file: /home/git/gitlab/.gitlab_workhorse_secret + ## GitLab Elasticsearch settings + elasticsearch: + indexer_path: /home/git/gitlab-elasticsearch-indexer/ + ## Git settings # CAUTION! # Use the default values unless you really know what you are doing diff --git a/config/initializers/8_devise.rb b/config/initializers/8_devise.rb index 8ef9ff6b7fc..8d4c5fa382c 100644 --- a/config/initializers/8_devise.rb +++ b/config/initializers/8_devise.rb @@ -214,11 +214,9 @@ Devise.setup do |config| # If you want to use other strategies, that are not supported by Devise, or # change the failure app, you can configure them inside the config.warden block. # - # config.warden do |manager| - # manager.failure_app = Gitlab::DeviseFailure - # manager.intercept_401 = false - # manager.default_strategies(scope: :user).unshift :some_external_strategy - # end + config.warden do |manager| + manager.failure_app = Gitlab::DeviseFailure + end if Gitlab::Auth::LDAP::Config.enabled? Gitlab::Auth::LDAP::Config.providers.each do |provider| |