mirror of
https://github.com/neocities/neocities.git
synced 2025-04-25 01:32:36 +02:00
use unmerged pull for cleaning activesupport out of json-jwt
This commit is contained in:
parent
8473b99d56
commit
9341271bda
2 changed files with 33 additions and 12 deletions
9
Gemfile
9
Gemfile
|
@ -39,7 +39,14 @@ gem 'simpleidn'
|
||||||
gem 'gandi'
|
gem 'gandi'
|
||||||
gem 'hoe', '3.14.2', require: nil
|
gem 'hoe', '3.14.2', require: nil
|
||||||
gem 'msgpack'
|
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
|
platform :mri, :rbx do
|
||||||
gem 'magic' # sudo apt-get install file, For OSX: brew install libmagic
|
gem 'magic' # sudo apt-get install file, For OSX: brew install libmagic
|
||||||
|
|
36
Gemfile.lock
36
Gemfile.lock
|
@ -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
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
acme-client (0.3.1)
|
|
||||||
faraday (~> 0.9, >= 0.9.1)
|
|
||||||
json-jwt (~> 1.2, >= 1.2.3)
|
|
||||||
activesupport (4.2.6)
|
activesupport (4.2.6)
|
||||||
i18n (~> 0.7)
|
i18n (~> 0.7)
|
||||||
json (~> 1.7, >= 1.7.7)
|
json (~> 1.7, >= 1.7.7)
|
||||||
|
@ -17,7 +35,7 @@ GEM
|
||||||
ansi (1.5.0)
|
ansi (1.5.0)
|
||||||
base32 (0.3.2)
|
base32 (0.3.2)
|
||||||
bcrypt (3.1.11)
|
bcrypt (3.1.11)
|
||||||
bindata (2.3.0)
|
bindata (2.3.1)
|
||||||
blankslate (3.1.3)
|
blankslate (3.1.3)
|
||||||
builder (3.2.2)
|
builder (3.2.2)
|
||||||
byebug (8.2.4)
|
byebug (8.2.4)
|
||||||
|
@ -73,6 +91,7 @@ GEM
|
||||||
hashie
|
hashie
|
||||||
geoip (1.6.1)
|
geoip (1.6.1)
|
||||||
hashdiff (0.3.0)
|
hashdiff (0.3.0)
|
||||||
|
hashery (2.1.2)
|
||||||
hashie (3.4.3)
|
hashie (3.4.3)
|
||||||
highline (1.7.8)
|
highline (1.7.8)
|
||||||
hiredis (0.6.1)
|
hiredis (0.6.1)
|
||||||
|
@ -88,12 +107,6 @@ GEM
|
||||||
rack (~> 1.4)
|
rack (~> 1.4)
|
||||||
rest-client (~> 1.0)
|
rest-client (~> 1.0)
|
||||||
json (1.8.3)
|
json (1.8.3)
|
||||||
json-jwt (1.5.2)
|
|
||||||
activesupport
|
|
||||||
bindata
|
|
||||||
multi_json (>= 1.3)
|
|
||||||
securecompare
|
|
||||||
url_safe_base64
|
|
||||||
m (1.4.2)
|
m (1.4.2)
|
||||||
method_source (>= 0.6.7)
|
method_source (>= 0.6.7)
|
||||||
rake (>= 0.9.2.2)
|
rake (>= 0.9.2.2)
|
||||||
|
@ -248,7 +261,7 @@ PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
acme-client
|
acme-client!
|
||||||
addressable
|
addressable
|
||||||
ago
|
ago
|
||||||
base32
|
base32
|
||||||
|
@ -271,6 +284,7 @@ DEPENDENCIES
|
||||||
jdbc-postgres
|
jdbc-postgres
|
||||||
jruby-openssl
|
jruby-openssl
|
||||||
json
|
json
|
||||||
|
json-jwt!
|
||||||
m
|
m
|
||||||
magic
|
magic
|
||||||
mail
|
mail
|
||||||
|
|
Loading…
Add table
Reference in a new issue