summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-03-03 00:13:19 +0000
committerJacob Schatz <jschatz1@gmail.com>2016-03-03 00:13:19 +0000
commit1fa7671f44291f78131c0fa31f6d1ffcb3ff6bbc (patch)
tree046701638803deb21c1d9242ea98138e6344bb9b /config
parent89270f77ed1ee5d74bba39edbbd5757d43af2a78 (diff)
parentd4981e9b4a9a548725eedff98b93c7ff3596c437 (diff)
downloadgitlab-ce-1fa7671f44291f78131c0fa31f6d1ffcb3ff6bbc.tar.gz
Merge branch 'improve-user-tabs' into 'master'
Add routes and actions for dynamic tab loading. Closes #13588 and #13584 See merge request !2961
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb
index a2acf170a6b..52c532601b4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -332,6 +332,15 @@ Rails.application.routes.draw do
get 'u/:username/calendar_activities' => 'users#calendar_activities', as: :user_calendar_activities,
constraints: { username: /.*/ }
+ get 'u/:username/groups' => 'users#groups', as: :user_groups,
+ constraints: { username: /.*/ }
+
+ get 'u/:username/projects' => 'users#projects', as: :user_projects,
+ constraints: { username: /.*/ }
+
+ get 'u/:username/contributed' => 'users#contributed', as: :user_contributed_projects,
+ constraints: { username: /.*/ }
+
get '/u/:username' => 'users#show', as: :user,
constraints: { username: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ }