Commit a000c2a1 authored by Brett Walker's avatar Brett Walker

moved devise_for :emails to live under `profiles`, removing the need

for `emails` to be a top level route
parent 867d59c5
# for secondary email confirmations - uses the same confirmation controller as :users
devise_for :emails, path: 'profile/emails', controllers: { confirmations: :confirmations }
resource :profile, only: [:show, :update] do resource :profile, only: [:show, :update] do
member do member do
get :audit_log get :audit_log
......
...@@ -11,9 +11,6 @@ devise_scope :user do ...@@ -11,9 +11,6 @@ devise_scope :user do
get '/users/almost_there' => 'confirmations#almost_there' get '/users/almost_there' => 'confirmations#almost_there'
end end
# for secondary email confirmations
devise_for :emails, controllers: { confirmations: :confirmations }
scope(constraints: { username: Gitlab::PathRegex.root_namespace_route_regex }) do scope(constraints: { username: Gitlab::PathRegex.root_namespace_route_regex }) do
scope(path: 'users/:username', scope(path: 'users/:username',
as: :user, as: :user,
......
...@@ -30,7 +30,6 @@ module Gitlab ...@@ -30,7 +30,6 @@ module Gitlab
ci ci
dashboard dashboard
deploy.html deploy.html
emails
explore explore
favicon.ico favicon.ico
files files
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment