Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump json from 1.7.5 to 2.3.1 #13

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 52 additions & 55 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,20 @@ GEM
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.3.2)
aes_key_wrap (1.1.0)
airbrussh (1.4.0)
sshkit (>= 1.6.1, != 1.7.0)
ansi (1.4.3)
arel (3.0.2)
attr_required (0.0.5)
attr_required (1.0.1)
bcrypt-ruby (3.0.1)
builder (3.0.3)
capistrano (2.13.4)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
bindata (2.4.8)
builder (3.0.4)
capistrano (3.14.1)
airbrussh (>= 1.0.0)
i18n
rake (>= 10.0.0)
sshkit (>= 1.9.0)
coderay (1.0.7)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
Expand All @@ -66,6 +69,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.3.3)
concurrent-ruby (1.1.6)
configatron (2.9.1)
yamler (>= 0.1.0)
cover_me (1.2.0)
Expand Down Expand Up @@ -102,21 +106,19 @@ GEM
mongoid (~> 3.0.6)
nokogiri (~> 1.5.5)
uuid (~> 2.3.5)
highline (1.6.15)
hike (1.2.1)
httpclient (2.2.7)
i18n (0.6.1)
hike (1.2.3)
httpclient (2.8.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
journey (1.0.4)
jquery-rails (2.1.2)
railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
jruby-pageant (1.1.1)
json (1.7.5)
json-jwt (0.1.8)
activesupport (>= 2.3)
i18n
json (>= 1.4.3)
url_safe_base64
json (2.3.1)
json-jwt (1.9.4)
activesupport
aes_key_wrap
bindata
kaminari (0.14.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
Expand All @@ -130,23 +132,18 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.8)
mime-types (1.19)
mime-types (1.25.1)
minitest (3.4.0)
mongoid (3.0.6)
activemodel (~> 3.1)
moped (~> 1.1)
origin (~> 1.0)
tzinfo (~> 0.3.22)
moped (1.2.2)
multi_json (1.3.6)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
net-ssh (2.6.0)
jruby-pageant (>= 1.1.1)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
multi_json (1.15.0)
net-scp (3.0.0)
net-ssh (>= 2.6.5, < 7.0.0)
net-ssh (6.1.0)
nokogiri (1.5.5)
omniauth (1.1.1)
hashie (~> 1.2)
Expand All @@ -166,29 +163,29 @@ GEM
validate_url
origin (1.0.8)
orm_adapter (0.4.0)
polyglot (0.3.3)
polyglot (0.3.5)
pry (0.9.10)
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.3.1)
pry-nav (0.2.2)
pry (~> 0.9.10)
rack (1.4.1)
rack-cache (1.2)
public_suffix (4.0.5)
rack (1.4.7)
rack-cache (1.12.0)
rack (>= 0.4)
rack-oauth2 (0.14.9)
activesupport (>= 2.3)
attr_required (>= 0.0.5)
httpclient (>= 2.2.0.2)
i18n
multi_json (>= 1.3.6)
rack (>= 1.1)
rack-oauth2 (1.10.0)
activesupport
attr_required
httpclient
json-jwt (>= 1.9.0)
rack
rack-openid (1.3.1)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
rack-ssl (1.3.2)
rack-ssl (1.3.4)
rack
rack-test (0.6.1)
rack-test (0.6.3)
rack (>= 1.0)
rails (3.2.8)
actionmailer (= 3.2.8)
Expand All @@ -205,9 +202,8 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
rake (13.0.1)
rdoc (3.9.5)
ruby-openid (2.2.0)
sass (3.2.1)
sass-rails (3.2.5)
Expand All @@ -217,16 +213,17 @@ GEM
sax-machine (0.1.0)
nokogiri (> 0.0.0)
slop (3.3.3)
sprockets (2.1.3)
sprockets (2.1.4)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
swd (0.1.2)
sshkit (1.21.0)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
swd (1.2.0)
activesupport (>= 3)
attr_required (>= 0.0.5)
httpclient (>= 2.2.1)
i18n
json (>= 1.4.3)
httpclient (>= 2.4)
symbolize (4.2.0)
systemu (2.5.2)
therubyracer (0.10.2)
Expand All @@ -235,25 +232,25 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.16.0)
tilt (1.3.3)
treetop (1.4.10)
thor (0.20.3)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
turn (0.9.6)
ansi
tzinfo (0.3.33)
tzinfo (0.3.57)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
url_safe_base64 (0.2.1)
uuid (2.3.5)
macaddr (~> 1.0)
validate_email (0.1.6)
activemodel (>= 3.0)
mail (>= 2.2.5)
validate_url (0.2.0)
validate_url (1.0.11)
activemodel (>= 3.0.0)
public_suffix
warden (1.2.1)
rack (>= 1.0)
webmock (1.8.10)
Expand Down