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
Léo-Paul Géneau
gitlab-ce
Commits
0b2fa3bf
Commit
0b2fa3bf
authored
Jan 06, 2016
by
Jose Corcuera
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix problem with projects ending with .keys #3076
parent
8b39b8cd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
CHANGELOG
CHANGELOG
+1
-0
config/routes.rb
config/routes.rb
+3
-3
spec/routing/project_routing_spec.rb
spec/routing/project_routing_spec.rb
+1
-0
No files found.
CHANGELOG
View file @
0b2fa3bf
...
@@ -12,6 +12,7 @@ v 8.4.0 (unreleased)
...
@@ -12,6 +12,7 @@ v 8.4.0 (unreleased)
- Add "Frequently used" category to emoji picker
- Add "Frequently used" category to emoji picker
- Add CAS support (tduehr)
- Add CAS support (tduehr)
- Add link to merge request on build detail page
- Add link to merge request on build detail page
- Fix: Problem with projects ending with .keys (Jose Corcuera)
- Revert back upvote and downvote button to the issue and MR pages
- Revert back upvote and downvote button to the issue and MR pages
- Swap position of Assignee and Author selector on Issuables (Zeger-Jan van de Weg)
- Swap position of Assignee and Author selector on Issuables (Zeger-Jan van de Weg)
- Add system hook messages for project rename and transfer (Steve Norman)
- Add system hook messages for project rename and transfer (Steve Norman)
...
...
config/routes.rb
View file @
0b2fa3bf
...
@@ -52,9 +52,6 @@ Rails.application.routes.draw do
...
@@ -52,9 +52,6 @@ Rails.application.routes.draw do
API
::
API
.
logger
Rails
.
logger
API
::
API
.
logger
Rails
.
logger
mount
API
::
API
=>
'/api'
mount
API
::
API
=>
'/api'
# Get all keys of user
get
':username.keys'
=>
'profiles/keys#get_keys'
,
constraints:
{
username:
/.*/
}
constraint
=
lambda
{
|
request
|
request
.
env
[
'warden'
].
authenticate?
and
request
.
env
[
'warden'
].
user
.
admin?
}
constraint
=
lambda
{
|
request
|
request
.
env
[
'warden'
].
authenticate?
and
request
.
env
[
'warden'
].
user
.
admin?
}
constraints
constraint
do
constraints
constraint
do
mount
Sidekiq
::
Web
,
at:
'/admin/sidekiq'
,
as: :sidekiq
mount
Sidekiq
::
Web
,
at:
'/admin/sidekiq'
,
as: :sidekiq
...
@@ -668,5 +665,8 @@ Rails.application.routes.draw do
...
@@ -668,5 +665,8 @@ Rails.application.routes.draw do
end
end
end
end
# Get all keys of user
get
':username.keys'
=>
'profiles/keys#get_keys'
,
constraints:
{
username:
/.*/
}
get
':id'
=>
'namespaces#show'
,
constraints:
{
id:
/(?:[^.]|\.(?!atom$))+/
,
format:
/atom/
}
get
':id'
=>
'namespaces#show'
,
constraints:
{
id:
/(?:[^.]|\.(?!atom$))+/
,
format:
/atom/
}
end
end
spec/routing/project_routing_spec.rb
View file @
0b2fa3bf
...
@@ -80,6 +80,7 @@ describe ProjectsController, 'routing' do
...
@@ -80,6 +80,7 @@ describe ProjectsController, 'routing' do
it
'to #show'
do
it
'to #show'
do
expect
(
get
(
'/gitlab/gitlabhq'
)).
to
route_to
(
'projects#show'
,
namespace_id:
'gitlab'
,
id:
'gitlabhq'
)
expect
(
get
(
'/gitlab/gitlabhq'
)).
to
route_to
(
'projects#show'
,
namespace_id:
'gitlab'
,
id:
'gitlabhq'
)
expect
(
get
(
'/gitlab/gitlabhq.keys'
)).
to
route_to
(
'projects#show'
,
namespace_id:
'gitlab'
,
id:
'gitlabhq.keys'
)
end
end
it
'to #update'
do
it
'to #update'
do
...
...
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