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
5790684d
Commit
5790684d
authored
Sep 19, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support pushing via SSH
parent
b51ededc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
lib/gitlab/auth.rb
lib/gitlab/auth.rb
+8
-1
lib/gitlab/lfs_token.rb
lib/gitlab/lfs_token.rb
+4
-0
No files found.
lib/gitlab/auth.rb
View file @
5790684d
...
@@ -130,7 +130,14 @@ module Gitlab
...
@@ -130,7 +130,14 @@ module Gitlab
if
actor
if
actor
token_handler
=
Gitlab
::
LfsToken
.
new
(
actor
)
token_handler
=
Gitlab
::
LfsToken
.
new
(
actor
)
Result
.
new
(
actor
,
nil
,
token_handler
.
type
,
read_authentication_abilities
)
if
Devise
.
secure_compare
(
token_handler
.
value
,
password
)
authentication_abilities
=
if
token_handler
.
user?
full_authentication_abilities
else
read_authentication_abilities
end
Result
.
new
(
actor
,
nil
,
token_handler
.
type
,
authentication_abilities
)
if
Devise
.
secure_compare
(
token_handler
.
value
,
password
)
end
end
end
end
...
...
lib/gitlab/lfs_token.rb
View file @
5790684d
...
@@ -33,6 +33,10 @@ module Gitlab
...
@@ -33,6 +33,10 @@ module Gitlab
end
end
end
end
def
user?
actor
.
is_a?
(
User
)
end
def
type
def
type
actor
.
is_a?
(
User
)
?
:lfs_token
:
:lfs_deploy_token
actor
.
is_a?
(
User
)
?
:lfs_token
:
:lfs_deploy_token
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