diff options
| author | Brett Walker <brett@digitalmoksha.com> | 2017-09-14 15:36:30 +0200 |
|---|---|---|
| committer | Brett Walker <brett@digitalmoksha.com> | 2017-09-23 15:26:04 +0200 |
| commit | a000c2a1443beb7de0b5193f89916ccce57170c5 (patch) | |
| tree | 83bb5dfed4a9d998445a74d832cf736ebaf400eb | |
| parent | 867d59c57f9b2501690b52671c9ca1ed54fb92d4 (diff) | |
| download | gitlab-ce-a000c2a1443beb7de0b5193f89916ccce57170c5.tar.gz | |
moved devise_for :emails to live under `profiles`, removing the need
for `emails` to be a top level route
| -rw-r--r-- | config/routes/profile.rb | 3 | ||||
| -rw-r--r-- | config/routes/user.rb | 3 | ||||
| -rw-r--r-- | lib/gitlab/path_regex.rb | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/config/routes/profile.rb b/config/routes/profile.rb index ea4dd9b67ec..ddc852f0132 100644 --- a/config/routes/profile.rb +++ b/config/routes/profile.rb @@ -1,3 +1,6 @@ +# 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 member do get :audit_log diff --git a/config/routes/user.rb b/config/routes/user.rb index 8ee79e96836..e682dcd6663 100644 --- a/config/routes/user.rb +++ b/config/routes/user.rb @@ -11,9 +11,6 @@ devise_scope :user do get '/users/almost_there' => 'confirmations#almost_there' end -# for secondary email confirmations -devise_for :emails, controllers: { confirmations: :confirmations } - scope(constraints: { username: Gitlab::PathRegex.root_namespace_route_regex }) do scope(path: 'users/:username', as: :user, diff --git a/lib/gitlab/path_regex.rb b/lib/gitlab/path_regex.rb index b119cb823b0..7c02c9c5c48 100644 --- a/lib/gitlab/path_regex.rb +++ b/lib/gitlab/path_regex.rb @@ -30,7 +30,6 @@ module Gitlab ci dashboard deploy.html - emails explore favicon.ico files |