diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-12 12:48:41 -0500 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-12 12:48:41 -0500 |
commit | 4d84ba43d8db6a205e79dd8cf723be7ceebf6925 (patch) | |
tree | 708d81727b559a1043e98788e0ef296893c126e2 /lib | |
parent | d05f0030a3de42ab3ec6d8c8be290b74698bb929 (diff) | |
parent | fc2d985bfaa156ad052858cd2025b0300327ff95 (diff) | |
download | gitlab-ce-4d84ba43d8db6a205e79dd8cf723be7ceebf6925.tar.gz |
Merge branch 'docker-registry' into docker-registry-view
Diffstat (limited to 'lib')
-rw-r--r-- | lib/jwt/rsa_token.rb | 2 | ||||
-rw-r--r-- | lib/jwt/token.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/jwt/rsa_token.rb b/lib/jwt/rsa_token.rb index cc265e3b31a..0438135ad54 100644 --- a/lib/jwt/rsa_token.rb +++ b/lib/jwt/rsa_token.rb @@ -1,4 +1,4 @@ -module Jwt +module JWT class RSAToken < Token attr_reader :key_file diff --git a/lib/jwt/token.rb b/lib/jwt/token.rb index 765ab0d60c7..f13abf2b71f 100644 --- a/lib/jwt/token.rb +++ b/lib/jwt/token.rb @@ -1,4 +1,4 @@ -module Jwt +module JWT class Token attr_accessor :issuer, :subject, :audience, :id attr_accessor :issued_at, :not_before, :expire_time @@ -43,4 +43,4 @@ module Jwt }.compact end end -end
\ No newline at end of file +end |