use unmerged pull for cleaning activesupport out of json-jwt

This commit is contained in:
Kyle Drake 2016-06-18 00:58:49 -07:00
parent 8473b99d56
commit 9341271bda
2 changed files with 33 additions and 12 deletions

View file

@ -39,7 +39,14 @@ gem 'simpleidn'
gem 'gandi'
gem 'hoe', '3.14.2', require: nil
gem 'msgpack'
gem 'acme-client'
gem 'json-jwt', {
git: 'https://github.com/neocities/json-jwt.git',
branch: 'drop_activesupport'
}
gem 'acme-client', {
git: 'https://github.com/jhass/acme-client.git',
branch: 'no_activesupport'
}
platform :mri, :rbx do
gem 'magic' # sudo apt-get install file, For OSX: brew install libmagic

View file

@ -1,9 +1,27 @@
GIT
remote: https://github.com/jhass/acme-client.git
revision: d0ced992bfe42908bb1fc25ac549ae3318386c97
branch: no_activesupport
specs:
acme-client (0.2.2)
faraday (~> 0.9, >= 0.9.1)
json-jwt (~> 1.2, >= 1.2.3)
GIT
remote: https://github.com/neocities/json-jwt.git
revision: 00d9c3d34e6bfbab866a4a0405897182a4ed3833
branch: drop_activesupport
specs:
json-jwt (1.5.2)
bindata
hashery (~> 2.0)
multi_json (>= 1.3)
securecompare
url_safe_base64
GEM
remote: https://rubygems.org/
specs:
acme-client (0.3.1)
faraday (~> 0.9, >= 0.9.1)
json-jwt (~> 1.2, >= 1.2.3)
activesupport (4.2.6)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
@ -17,7 +35,7 @@ GEM
ansi (1.5.0)
base32 (0.3.2)
bcrypt (3.1.11)
bindata (2.3.0)
bindata (2.3.1)
blankslate (3.1.3)
builder (3.2.2)
byebug (8.2.4)
@ -73,6 +91,7 @@ GEM
hashie
geoip (1.6.1)
hashdiff (0.3.0)
hashery (2.1.2)
hashie (3.4.3)
highline (1.7.8)
hiredis (0.6.1)
@ -88,12 +107,6 @@ GEM
rack (~> 1.4)
rest-client (~> 1.0)
json (1.8.3)
json-jwt (1.5.2)
activesupport
bindata
multi_json (>= 1.3)
securecompare
url_safe_base64
m (1.4.2)
method_source (>= 0.6.7)
rake (>= 0.9.2.2)
@ -248,7 +261,7 @@ PLATFORMS
ruby
DEPENDENCIES
acme-client
acme-client!
addressable
ago
base32
@ -271,6 +284,7 @@ DEPENDENCIES
jdbc-postgres
jruby-openssl
json
json-jwt!
m
magic
mail