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.

Sign up for GitHub

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

Jump to bottom

Fix JSON compatibility with MRI Ruby 2.4.0 #54

Merged
merged 2 commits into from
Jan 4, 2017
Merged

Fix JSON compatibility with MRI Ruby 2.4.0 #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
941cc93
Update to Ruby 2.4.0 compatible JSON gem.
todd-a-jacobs Jan 3, 2017
e2ad006
Minimalist Gemfile.lock update.
todd-a-jacobs Jan 3, 2017
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
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ group :development, :test do
gem "nifty-generators"
end

gem 'json'
gem 'json', '~> 2.0'
gem 'haml'
gem 'haml-rails'
gem 'therubyracer'
Expand Down
15 changes: 7 additions & 8 deletions Gemfile.lock
View file
Open in desktop
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