summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-10-13 16:07:16 +0300
committerRobert Speicher <rspeicher@gmail.com>2016-10-17 20:34:56 +0200
commita5f5c02598d189428c583572d42f38e478669771 (patch)
tree4d6b54f4d983b99fd5014bac3494f79ccc7ef7eb
parent41de407837dec94925af40c9c556ec9303f4de4e (diff)
downloadgitlab-ce-dz-rename-user-routes.tar.gz
Add todo for deprecated user routes and more information about deprecation to changelogdz-rename-user-routes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--CHANGELOG2
-rw-r--r--config/routes/user.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 2cbf5bc3277..1e887de6867 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -78,6 +78,7 @@ v 8.13.0 (unreleased)
- Replace bootstrap caret with fontawesome caret (ClemMakesApps)
- Fix unnecessary escaping of reserved HTML characters in milestone title. !6533
- Add organization field to user profile
+ - Change user pages routing from /u/:username/PATH to /users/:username/PATH. Old routes will redirect to the new ones for the time being.
- Fix enter key when navigating search site search dropdown. !6643 (Brennan Roberts)
- Fix deploy status responsiveness error !6633
- Make searching for commits case insensitive
@@ -102,7 +103,6 @@ v 8.13.0 (unreleased)
- Fix a typo in doc/api/labels.md
- API: all unknown routing will be handled with 404 Not Found
- Make guests unable to view MRs on private projects
- - Change user pages routing from /u/:username/PATH to /users/:username/PATH
v 8.12.6
- Update mailroom to 0.8.1 in Gemfile.lock !6814
diff --git a/config/routes/user.rb b/config/routes/user.rb
index ae15b9d02a3..53f9aafc107 100644
--- a/config/routes/user.rb
+++ b/config/routes/user.rb
@@ -34,7 +34,9 @@ scope(path: 'users/:username',
end
# Compatibility with old routing
+# TODO (dzaporozhets): remove in 10.0
get '/u/:username', to: redirect('/%{username}'), constraints: { username: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ }
+# TODO (dzaporozhets): remove in 9.0
get '/u/:username/groups', to: redirect('/users/%{username}/groups'), constraints: { username: /[a-zA-Z.0-9_\-]+/ }
get '/u/:username/projects', to: redirect('/users/%{username}/projects'), constraints: { username: /[a-zA-Z.0-9_\-]+/ }
get '/u/:username/snippets', to: redirect('/users/%{username}/snippets'), constraints: { username: /[a-zA-Z.0-9_\-]+/ }