projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
18801: Fixes the regression by ignoring the case where api_token isn't there.
[arvados.git]
/
services
/
api
/
app
/
models
/
api_client.rb
diff --git
a/services/api/app/models/api_client.rb
b/services/api/app/models/api_client.rb
index 015b61dc494c1c7b3cff629407cb0ebdc0ff656c..c914051a349685aa5f73dc419a16a17449a4b2f5 100644
(file)
--- a/
services/api/app/models/api_client.rb
+++ b/
services/api/app/models/api_client.rb
@@
-15,7
+15,7
@@
class ApiClient < ArvadosModel
end
def is_trusted
- (from_trusted_url && Rails.configuration.Login.
TokenLifetime == 0
) || super
+ (from_trusted_url && Rails.configuration.Login.
IssueTrustedTokens
) || super
end
protected