diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-03-11 22:34:33 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-03-11 22:34:33 +0000 |
| commit | cb81c8a5efd54586a19cbeeb69c7572b58dc1a81 (patch) | |
| tree | 6f18f4682bc472938f214bad831da48eaf941e04 /config | |
| parent | 70bf6dc702b6354c3a00d0b81e7d7c10be25ffb8 (diff) | |
| parent | 5844a21a0acae08a19fa82984dcc0feb1b8777c5 (diff) | |
| download | gitlab-ce-cb81c8a5efd54586a19cbeeb69c7572b58dc1a81.tar.gz | |
Merge branch 'rs-issue-12944' into 'master'
Use a custom Devise failure app to handle unauthenticated .zip requests
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944
See merge request !2828
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/devise.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index d82cfb3ec0c..31dceaebcad 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -203,11 +203,11 @@ 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 = AnotherApp - # manager.intercept_401 = false - # manager.default_strategies(scope: :user).unshift :some_external_strategy - # end + config.warden do |manager| + manager.failure_app = Gitlab::DeviseFailure + # manager.intercept_401 = false + # manager.default_strategies(scope: :user).unshift :some_external_strategy + end if Gitlab::LDAP::Config.enabled? Gitlab.config.ldap.servers.values.each do |server| |