diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-07-27 16:22:52 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-07-27 16:22:52 +0000 |
| commit | 066f4d8b715aa6c58bffe39b7f9fb35e6e6ff8a9 (patch) | |
| tree | 301e3b9c9db6ec0007809567272b0d93978ba292 | |
| parent | aafa3f9fe09fcd8468a8f4274492f63ebead941a (diff) | |
| parent | 3d83181b81b9ef54a0b310e6ce2eabc7660a0040 (diff) | |
| download | gitlab-ce-066f4d8b715aa6c58bffe39b7f9fb35e6e6ff8a9.tar.gz | |
Merge branch 'remove_custom_devise_failure_app' into 'master'
Remove GitLab custom failure app for Devise
See merge request !13136
| -rw-r--r-- | config/initializers/devise.rb | 12 | ||||
| -rw-r--r-- | lib/gitlab/devise_failure.rb | 23 |
2 files changed, 6 insertions, 29 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 3b1317030bc..3aed2136f1b 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -192,7 +192,7 @@ Devise.setup do |config| # # The :"*/*" and "*/*" formats below is required to match Internet # Explorer requests. - # config.navigational_formats = [:"*/*", "*/*", :html] + config.navigational_formats = [:"*/*", "*/*", :html, :zip] # The default HTTP method used to sign out a resource. Default is :delete. config.sign_out_via = :delete @@ -206,11 +206,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 = 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 + # manager.intercept_401 = false + # manager.default_strategies(scope: :user).unshift :some_external_strategy + # end if Gitlab::LDAP::Config.enabled? Gitlab::LDAP::Config.providers.each do |provider| diff --git a/lib/gitlab/devise_failure.rb b/lib/gitlab/devise_failure.rb deleted file mode 100644 index a78fde9d782..00000000000 --- a/lib/gitlab/devise_failure.rb +++ /dev/null @@ -1,23 +0,0 @@ -module Gitlab - class DeviseFailure < Devise::FailureApp - protected - - # Override `Devise::FailureApp#request_format` to handle a special case - # - # This tells Devise to handle an unauthenticated `.zip` request as an HTML - # request (i.e., redirect to sign in). - # - # Otherwise, Devise would respond with a 401 Unauthorized with - # `Content-Type: application/zip` and a response body in plaintext, and the - # browser would freak out. - # - # See https://gitlab.com/gitlab-org/gitlab-ce/issues/12944 - def request_format - if request.format == :zip - Mime::Type.lookup_by_extension(:html).ref - else - super - end - end - end -end |