Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a000c2a1
Commit
a000c2a1
authored
Sep 14, 2017
by
Brett Walker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
moved devise_for :emails to live under `profiles`, removing the need
for `emails` to be a top level route
parent
867d59c5
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
config/routes/profile.rb
config/routes/profile.rb
+3
-0
config/routes/user.rb
config/routes/user.rb
+0
-3
lib/gitlab/path_regex.rb
lib/gitlab/path_regex.rb
+0
-1
No files found.
config/routes/profile.rb
View file @
a000c2a1
# 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
...
...
config/routes/user.rb
View file @
a000c2a1
...
@@ -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
,
...
...
lib/gitlab/path_regex.rb
View file @
a000c2a1
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment