home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 09:36:47 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'show_files_with_diff_name' into 'master'

Browse Source 
Show files named diff

Fixes #1749

See merge request !1318
This commit is contained in:
Dmitriy Zaporozhets
2014-12-11 14:07:12 +00:00
parent feb7c2bcce 1d0dfd50cc
commit 65b858a776
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/routes.rb
+1 -1
View File
@@ -191,7 +191,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: /.+/}
spec/routing/project_routing_spec.rb
+1
View File
@@ -417,6 +417,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