diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-07-07 11:32:12 +0400 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-07-11 21:53:10 +0400 |
| commit | 55efb2d9f2f3024137cfd28ec0b58c723f044b42 (patch) | |
| tree | 164a77a84c8a98ee1c958a5732c3a18b0e025f04 /config | |
| parent | f3b0cb77fcb379107cdd4f770fdb16381cda1baf (diff) | |
Revert "Merge branch 'redirect_after_login' into 'master'"
This reverts commit 5aaa35656edaf309354528e197a54461f584ed21, reversing
changes made to 5b8c1767676b94f58558e6de320965c68b57de42.
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index 244cb339898..06fb18ac785 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -160,7 +160,7 @@ Gitlab::Application.routes.draw do resources :projects, constraints: { id: /[^\/]+/ }, only: [:new, :create] - devise_for :users, controllers: { omniauth_callbacks: :omniauth_callbacks, registrations: :registrations , passwords: :passwords, sessions: :users_sessions } + devise_for :users, controllers: { omniauth_callbacks: :omniauth_callbacks, registrations: :registrations , passwords: :passwords} devise_scope :user do get "/users/auth/:provider/omniauth_error" => "omniauth_callbacks#omniauth_error", as: :omniauth_error |