summaryrefslogtreecommitdiff
path: root/app/services
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2017-06-21 09:22:39 +0000
committerTimothy Andrew <mail@timothyandrew.net>2017-06-28 07:17:13 +0000
commit1b8223dd51345f6075172a92dab610f9dee89d84 (patch)
tree426b9b5e599e074724941baf1ce3fbade6e3b4e8 /app/services
parent8b399b185cf72f396be8d6b7caae37f2a3aa4279 (diff)
downloadgitlab-ce-1b8223dd51345f6075172a92dab610f9dee89d84.tar.gz
Fix remaining spec failures for !12300.
1. Get the spec for `lib/gitlab/auth.rb` passing. - Make the `request` argument to `AccessTokenValidationService` optional - `auth.rb` doesn't need to pass in a request. - Pass in scopes in the format `[{ name: 'api' }]` rather than `['api']`, which is what `AccessTokenValidationService` now expects. 2. Get the spec for `API::V3::Users` passing 2. Get the spec for `AccessTokenValidationService` passing
Diffstat (limited to 'app/services')
-rw-r--r--app/services/access_token_validation_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/access_token_validation_service.rb b/app/services/access_token_validation_service.rb
index 6d39ad245d2..450e90d947d 100644
--- a/app/services/access_token_validation_service.rb
+++ b/app/services/access_token_validation_service.rb
@@ -7,7 +7,7 @@ class AccessTokenValidationService
attr_reader :token, :request
- def initialize(token, request)
+ def initialize(token, request: nil)
@token = token
@request = request
end