diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-29 11:23:17 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-29 11:23:24 +0300 |
| commit | 2234b4382091add4dfe8d44f4e0764bf64ff8c5e (patch) | |
| tree | 2e16ea43616574e4612223b7cdb70322ce914648 /lib/gitlab/conan_token.rb | |
| parent | 6c85cb2ff17cf4ea34372e84ef579734fd607cec (diff) | |
Add latest changes from gitlab-org/security/gitlab@14-10-stable-ee
Diffstat (limited to 'lib/gitlab/conan_token.rb')
| -rw-r--r-- | lib/gitlab/conan_token.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/conan_token.rb b/lib/gitlab/conan_token.rb index d0560807f45..87a085461bc 100644 --- a/lib/gitlab/conan_token.rb +++ b/lib/gitlab/conan_token.rb @@ -13,8 +13,8 @@ module Gitlab attr_reader :access_token_id, :user_id class << self - def from_personal_access_token(access_token) - new(access_token_id: access_token.id, user_id: access_token.user_id) + def from_personal_access_token(user_id, token) + new(access_token_id: token, user_id: user_id) end def from_job(job) |