summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-09-02 12:39:03 +0000
committerGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-09-02 12:39:03 +0000
commit90432d32acd69cf91e647fc508045659cae26b1a (patch)
tree2b2da74ca70007a0343a131ed187dcdbdbfeb7dd /config
parentf4a969f7f495978a7e656c69c929c9fdac111cff (diff)
parent417a126de5e49fb7c63bb3f23b22bc4a484ac359 (diff)
downloadgitlab-ce-90432d32acd69cf91e647fc508045659cae26b1a.tar.gz
Merge remote-tracking branch 'dev/13-3-stable' into 13-3-stable
Diffstat (limited to 'config')
-rw-r--r--config/routes/user.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/config/routes/user.rb b/config/routes/user.rb
index 3bf13908d39..c7a5a56d9ed 100644
--- a/config/routes/user.rb
+++ b/config/routes/user.rb
@@ -25,7 +25,6 @@ devise_for :users, controllers: { omniauth_callbacks: :omniauth_callbacks,
confirmations: :confirmations }
devise_scope :user do
- get '/users/auth/:provider/omniauth_error' => 'omniauth_callbacks#omniauth_error', as: :omniauth_error
get '/users/almost_there' => 'confirmations#almost_there'
end