Skip to content

Commit

Permalink
Minimalist Gemfile.lock update.
Browse files Browse the repository at this point in the history
In order to use the Ruby 2.4.0 compatible JSON gem, other dependencies
need to be resolved. Specifically:

    bundle update json omniauth-twitter sass-rails
  • Loading branch information
todd-a-jacobs committed Jan 4, 2017
1 parent 941cc93 commit e2ad006
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ GEM
jquery-rails (3.1.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
json (2.0.2)
kgio (2.11.0)
libv8 (3.16.14.17)
linecache (1.3.1)
Expand All @@ -106,9 +106,9 @@ GEM
omniauth-openid (1.0.1)
omniauth (~> 1.0)
rack-openid (~> 1.3.1)
omniauth-twitter (1.2.1)
json (~> 1.3)
omniauth-oauth (~> 1.1)
omniauth-twitter (1.1.0)
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
orm_adapter (0.5.0)
pg (0.19.0)
polyglot (0.3.5)
Expand Down Expand Up @@ -146,8 +146,7 @@ GEM
thor (>= 0.14.6, < 2.0)
raindrops (0.17.0)
rake (12.0.0)
rdoc (3.12.2)
json (~> 1.4)
rdoc (3.9.5)
ref (2.0.0)
responders (1.1.2)
railties (>= 3.2, < 4.2)
Expand Down Expand Up @@ -202,7 +201,7 @@ DEPENDENCIES
haml-rails
high_voltage (~> 2.1.0)
jquery-rails
json
json (~> 2.0)
modernizr-rails!
nifty-generators
omniauth
Expand All @@ -221,4 +220,4 @@ DEPENDENCIES
unicorn

BUNDLED WITH
1.13.6
1.13.7

0 comments on commit e2ad006

Please sign in to comment.