diff options
| author | Dennis Tang <dtang@gitlab.com> | 2018-05-31 21:51:08 +0200 |
|---|---|---|
| committer | Dennis Tang <dtang@gitlab.com> | 2018-05-31 21:51:08 +0200 |
| commit | 5b3345a0b89df6a86c6cf95a12a75984abf1de25 (patch) | |
| tree | 4275f18f02052a82eea26d4ab8c06d6731f6d1d4 /config | |
| parent | abad4ff00c34409ef7a35b11b74c0ed09c1c1666 (diff) | |
| parent | f153faa86e5ed3c0fff43f92bcc6121fe79b1070 (diff) | |
| download | gitlab-ce-5b3345a0b89df6a86c6cf95a12a75984abf1de25.tar.gz | |
Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs
# Conflicts:
# app/views/projects/_merge_request_merge_method_settings.html.haml
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/dashboard.rb | 1 | ||||
| -rw-r--r-- | config/routes/group.rb | 3 | ||||
| -rw-r--r-- | config/routes/profile.rb | 2 | ||||
| -rw-r--r-- | config/routes/project.rb | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/config/routes/dashboard.rb b/config/routes/dashboard.rb index d2437285cdf..f1e8c2b9d82 100644 --- a/config/routes/dashboard.rb +++ b/config/routes/dashboard.rb @@ -1,4 +1,5 @@ resource :dashboard, controller: 'dashboard', only: [] do + get :issues, action: :issues_calendar, constraints: lambda { |req| req.format == :ics } get :issues get :merge_requests get :activity diff --git a/config/routes/group.rb b/config/routes/group.rb index fff0914c3cd..b09eb3c1b5b 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -5,9 +5,10 @@ end constraints(::Constraints::GroupUrlConstrainer.new) do scope(path: 'groups/*id', controller: :groups, - constraints: { id: Gitlab::PathRegex.full_namespace_route_regex, format: /(html|json|atom)/ }) do + constraints: { id: Gitlab::PathRegex.full_namespace_route_regex, format: /(html|json|atom|ics)/ }) do scope(path: '-') do get :edit, as: :edit_group + get :issues, as: :issues_group_calendar, action: :issues_calendar, constraints: lambda { |req| req.format == :ics } get :issues, as: :issues_group get :merge_requests, as: :merge_requests_group get :projects, as: :projects_group diff --git a/config/routes/profile.rb b/config/routes/profile.rb index a9ba5ac2c0b..c1cac3905f1 100644 --- a/config/routes/profile.rb +++ b/config/routes/profile.rb @@ -7,7 +7,7 @@ resource :profile, only: [:show, :update] do get :applications, to: 'oauth/applications#index' put :reset_incoming_email_token - put :reset_rss_token + put :reset_feed_token put :update_username end diff --git a/config/routes/project.rb b/config/routes/project.rb index 8ecebcf263a..7df2d4abb75 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -342,6 +342,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end end + get :issues, to: 'issues#calendar', constraints: lambda { |req| req.format == :ics } resources :issues, concerns: :awardable, constraints: { id: /\d+/ } do member do post :toggle_subscription |