Skip to content

Bump json from 1.7.7 to 2.3.1 #3

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

Open
dependabot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump json from 1.7.7 to 2.3.1 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -2,7 +2,7 @@ source 'https://rubygems.org'

gem 'rails', '3.2.13'

gem "json", "~> 1.7.7"
gem "json", "~> 2.3.1"

gem 'pg', '~> 0.13.2'
gem "thin"
Expand Down
28 changes: 13 additions & 15 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ GEM
arel (3.0.2)
authlogic (3.1.0)
activerecord (>= 3.0.7)
activerecord (>= 3.0.7)
awesome_nested_set (2.1.4)
activerecord (>= 3.0.0)
builder (3.0.4)
Expand Down Expand Up @@ -140,7 +139,7 @@ GEM
railties (~> 3.0)
has_scope (0.5.1)
highline (1.6.12)
hike (1.2.1)
hike (1.2.3)
hirb (0.6.2)
i18n (0.6.1)
image_size (1.1.0)
Expand All @@ -151,7 +150,7 @@ GEM
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
json (1.7.7)
json (2.3.1)
kaminari (0.14.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
Expand All @@ -176,7 +175,7 @@ GEM
mime-types (1.21)
mini_magick (3.4)
subexec (~> 0.2.1)
multi_json (1.7.1)
multi_json (1.15.0)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
Expand All @@ -194,12 +193,12 @@ GEM
slop (~> 3.3.1)
pry-rails (0.2.2)
pry (>= 0.9.10)
rack (1.4.5)
rack-cache (1.2)
rack (1.4.7)
rack-cache (1.12.0)
rack (>= 0.4)
rack-ssl (1.3.3)
rack-ssl (1.3.4)
rack
rack-test (0.6.2)
rack-test (0.6.3)
rack (>= 1.0)
rails (3.2.13)
actionmailer (= 3.2.13)
Expand All @@ -216,11 +215,10 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.0.3)
rake (13.0.1)
rb-inotify (0.8.8)
ffi (>= 0.5.0)
rdoc (3.12.2)
json (~> 1.4)
rdoc (3.9.5)
responders (0.9.1)
railties (~> 3.1)
rspec (2.10.0)
Expand Down Expand Up @@ -278,7 +276,7 @@ GEM
actionpack (~> 3.0)
activemodel (~> 3.0)
slop (3.3.3)
sprockets (2.2.2)
sprockets (2.2.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
Expand All @@ -290,8 +288,8 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.17.0)
tilt (1.3.6)
thor (0.20.3)
tilt (1.4.1)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
Expand Down Expand Up @@ -345,7 +343,7 @@ DEPENDENCIES
hirb
inherited_resources (~> 1.3.1)
jquery-rails
json (~> 1.7.7)
json (~> 2.3.1)
kaminari (~> 0.14.1)
launchy (~> 2.1.0)
libnotify (~> 0.7.2)
Expand Down