summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorHannes Rosenögger <123haynes@gmail.com>2015-03-13 11:39:26 +0100
committerHannes Rosenögger <123haynes@gmail.com>2015-03-18 08:42:42 +0100
commit9e5738b0072f8715d52801f3469be9f3742beb97 (patch)
treee6f83c4c42e05309ef20150796aefe372026e68f /config
parentdbd347bfa00e133da8ac178612ed8c30ef871ca4 (diff)
downloadgitlab-ce-9e5738b0072f8715d52801f3469be9f3742beb97.tar.gz
Extend the commit calendar to show the actual commits for a date
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb
index e65ef30afb7..0950bed3cf1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -198,7 +198,10 @@ Gitlab::Application.routes.draw do
end
get 'u/:username/calendar' => 'users#calendar', as: :user_calendar,
- constraints: { username: /(?:[^.]|\.(?!atom$))+/, format: /atom/ }
+ constraints: { username: /.*/ }
+
+ get 'u/:username/calendar_activities' => 'users#calendar_activities', as: :user_calendar_activities,
+ constraints: { username: /.*/ }
get '/u/:username' => 'users#show', as: :user,
constraints: { username: /(?:[^.]|\.(?!atom$))+/, format: /atom/ }