Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
65b858a7
Commit
65b858a7
authored
Dec 11, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'show_files_with_diff_name' into 'master'
Show files named diff Fixes #1749 See merge request !1318
parents
feb7c2bc
1d0dfd50
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
config/routes.rb
config/routes.rb
+1
-1
spec/routing/project_routing_spec.rb
spec/routing/project_routing_spec.rb
+1
-0
No files found.
config/routes.rb
View file @
65b858a7
...
...
@@ -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
View file @
65b858a7
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment