Commit c058e3903e01b950d19fe8ce86702f24083c8395
1 parent
9d394250
Exists in
master
and in
4 other branches
Finalize new routes
Showing
1 changed file
with
4 additions
and
10 deletions
Show diff stats
config/routes.rb
| @@ -161,31 +161,25 @@ Gitlab::Application.routes.draw do | @@ -161,31 +161,25 @@ Gitlab::Application.routes.draw do | ||
| 161 | 161 | ||
| 162 | # XXX: WIP | 162 | # XXX: WIP |
| 163 | resources :commit, only: [:show], constraints: {id: /[[:alnum:]]{6,40}/} | 163 | resources :commit, only: [:show], constraints: {id: /[[:alnum:]]{6,40}/} |
| 164 | - resources :commits, only: [:show], constraints: {id: /.+/}, as: 'history' | 164 | + resources :commits, only: [:show], constraints: {id: /.+/} |
| 165 | + resources :compare, only: [:index] | ||
| 165 | resources :blame, only: [:show], constraints: {id: /.+/} | 166 | resources :blame, only: [:show], constraints: {id: /.+/} |
| 166 | resources :blob, only: [:show], constraints: {id: /.+/} | 167 | resources :blob, only: [:show], constraints: {id: /.+/} |
| 167 | - # resources :raw, only: [:show], constraints: {id: /.+/} | ||
| 168 | - resources :tree, only: [:show], constraints: {id: /.+/} | 168 | + resources :tree, only: [:show], constraints: {id: /.+/} |
| 169 | match "/compare/:from...:to" => "compare#show", as: "compare", constraints: {from: /.+/, to: /.+/} | 169 | match "/compare/:from...:to" => "compare#show", as: "compare", constraints: {from: /.+/, to: /.+/} |
| 170 | 170 | ||
| 171 | - # resources :commits, only: [:show], as: 'history' do | ||
| 172 | - # member do | ||
| 173 | - # get :patch | ||
| 174 | - # end | ||
| 175 | - # end | ||
| 176 | - | ||
| 177 | resources :team, controller: 'team_members', only: [:index] | 171 | resources :team, controller: 'team_members', only: [:index] |
| 178 | resources :team_members | 172 | resources :team_members |
| 179 | resources :milestones | 173 | resources :milestones |
| 180 | resources :labels, only: [:index] | 174 | resources :labels, only: [:index] |
| 181 | resources :issues do | 175 | resources :issues do |
| 182 | - | ||
| 183 | collection do | 176 | collection do |
| 184 | post :sort | 177 | post :sort |
| 185 | post :bulk_update | 178 | post :bulk_update |
| 186 | get :search | 179 | get :search |
| 187 | end | 180 | end |
| 188 | end | 181 | end |
| 182 | + | ||
| 189 | resources :notes, only: [:index, :create, :destroy] do | 183 | resources :notes, only: [:index, :create, :destroy] do |
| 190 | collection do | 184 | collection do |
| 191 | post :preview | 185 | post :preview |