From 22368fb8e8d684fd540120c33233cf0c42825f3e Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Wed, 10 Dec 2014 15:52:56 +0100 Subject: Add a failing route spec for file named diff. --- spec/routing/project_routing_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb index ea584c9802d..0c76dd5a089 100644 --- a/spec/routing/project_routing_spec.rb +++ b/spec/routing/project_routing_spec.rb @@ -415,6 +415,7 @@ describe Projects::BlobController, "routing" do it "to #show" do get("/gitlab/gitlabhq/blob/master/app/models/project.rb").should route_to('projects/blob#show', project_id: 'gitlab/gitlabhq', id: 'master/app/models/project.rb') get("/gitlab/gitlabhq/blob/master/app/models/compare.rb").should route_to('projects/blob#show', project_id: 'gitlab/gitlabhq', id: 'master/app/models/compare.rb') + get("/gitlab/gitlabhq/blob/master/app/models/diff.js").should route_to('projects/blob#show', project_id: 'gitlab/gitlabhq', id: 'master/app/models/diff.js') get("/gitlab/gitlabhq/blob/master/files.scss").should route_to('projects/blob#show', project_id: 'gitlab/gitlabhq', id: 'master/files.scss') end end -- cgit v1.2.1 From 1d0dfd50cc7a795b948bc19d701518681b3c9439 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Wed, 10 Dec 2014 15:54:01 +0100 Subject: Do not check for format on blob diff path. --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index f2984069b71..7483ea42e12 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -190,7 +190,7 @@ Gitlab::Application.routes.draw do end scope module: :projects do - resources :blob, only: [:show, :destroy], constraints: { id: /.+/ } do + resources :blob, only: [:show, :destroy], constraints: { id: /.+/, format: false } do get :diff, on: :member end resources :raw, only: [:show], constraints: {id: /.+/} -- cgit v1.2.1