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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
4f687aaa
Commit
4f687aaa
authored
Oct 26, 2012
by
Saito
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1827 from mgrobelin/master
grack auth bugfix: allow dots in reponame
parents
643ed9cb
bd50a9f4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
config/routes.rb
config/routes.rb
+1
-1
lib/gitlab/backend/grack_auth.rb
lib/gitlab/backend/grack_auth.rb
+2
-2
No files found.
config/routes.rb
View file @
4f687aaa
...
@@ -18,7 +18,7 @@ Gitlab::Application.routes.draw do
...
@@ -18,7 +18,7 @@ Gitlab::Application.routes.draw do
project_root:
Gitlab
.
config
.
git_base_path
,
project_root:
Gitlab
.
config
.
git_base_path
,
upload_pack:
Gitlab
.
config
.
git_upload_pack
,
upload_pack:
Gitlab
.
config
.
git_upload_pack
,
receive_pack:
Gitlab
.
config
.
git_receive_pack
receive_pack:
Gitlab
.
config
.
git_receive_pack
}),
at:
'/:path'
,
constraints:
{
path:
/[\w-]+\.git/
}
}),
at:
'/:path'
,
constraints:
{
path:
/[\w
\.
-]+\.git/
}
#
#
# Help
# Help
...
...
lib/gitlab/backend/grack_auth.rb
View file @
4f687aaa
...
@@ -18,7 +18,7 @@ module Grack
...
@@ -18,7 +18,7 @@ module Grack
@env
[
'SCRIPT_NAME'
]
=
""
@env
[
'SCRIPT_NAME'
]
=
""
# Find project by PATH_INFO from env
# Find project by PATH_INFO from env
if
m
=
/^\/([\w
-]+)
.git/
.
match
(
@request
.
path_info
).
to_a
if
m
=
/^\/([\w
\.-]+)\
.git/
.
match
(
@request
.
path_info
).
to_a
self
.
project
=
Project
.
find_by_path
(
m
.
last
)
self
.
project
=
Project
.
find_by_path
(
m
.
last
)
return
false
unless
project
return
false
unless
project
end
end
...
@@ -65,7 +65,7 @@ module Grack
...
@@ -65,7 +65,7 @@ module Grack
end
end
# Need to reset seek point
# Need to reset seek point
@request
.
body
.
rewind
@request
.
body
.
rewind
/refs\/heads\/([\w-]+)/
.
match
(
input
).
to_a
.
first
/refs\/heads\/([\w
\.
-]+)/
.
match
(
input
).
to_a
.
first
end
end
protected
protected
...
...
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