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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
fca95708
Commit
fca95708
authored
Jun 29, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1020 from SaitoWu/feature/https
Feature/https
parents
f73d7181
aefe4dc3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
config/initializers/grack_auth.rb
config/initializers/grack_auth.rb
+4
-1
config/routes.rb
config/routes.rb
+1
-1
No files found.
config/initializers/grack_auth.rb
View file @
fca95708
...
@@ -5,7 +5,10 @@ module Grack
...
@@ -5,7 +5,10 @@ module Grack
# Authentication with username and password
# Authentication with username and password
email
,
password
=
@auth
.
credentials
email
,
password
=
@auth
.
credentials
user
=
User
.
find_by_email
(
email
)
user
=
User
.
find_by_email
(
email
)
return
false
unless
user
.
valid_password?
(
password
)
return
false
unless
user
.
try
(
:valid_password?
,
password
)
# Need this patch because the rails mount
@env
[
'PATH_INFO'
]
=
@env
[
'REQUEST_PATH'
]
# Find project by PATH_INFO from env
# Find project by PATH_INFO from env
if
m
=
/^\/([\w-]+).git/
.
match
(
@env
[
'PATH_INFO'
]).
to_a
if
m
=
/^\/([\w-]+).git/
.
match
(
@env
[
'PATH_INFO'
]).
to_a
...
...
config/routes.rb
View file @
fca95708
...
@@ -18,7 +18,7 @@ Gitlab::Application.routes.draw do
...
@@ -18,7 +18,7 @@ Gitlab::Application.routes.draw do
project_root:
GIT_HOST
[
'base_path'
],
project_root:
GIT_HOST
[
'base_path'
],
upload_pack:
GIT_HOST
[
'upload_pack'
],
upload_pack:
GIT_HOST
[
'upload_pack'
],
receive_pack:
GIT_HOST
[
'receive_pack'
]
receive_pack:
GIT_HOST
[
'receive_pack'
]
}),
at:
'/
git'
}),
at:
'/
:path'
,
constraints:
{
path:
/[\w-]+.git*/
}
#
#
# Help
# Help
...
...
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