Skip to content

Commit 3d68ad2

Browse files
Bump json from 1.8.3 to 2.3.1
Bumps [json](https://github.com/flori/json) from 1.8.3 to 2.3.1. - [Release notes](https://github.com/flori/json/releases) - [Changelog](https://github.com/flori/json/blob/master/CHANGES.md) - [Commits](ruby/json@v1.8.3...v2.3.1) Signed-off-by: dependabot[bot] <support@github.com>
1 parent f5abb27 commit 3d68ad2

File tree

2 files changed

+8
-13
lines changed

2 files changed

+8
-13
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ gem 'rails', '3.2.22.5'
66
##gem 'rack', '~> 1.5.4'
77
# gem 'hoptoad_notifier', '2.4.11'
88
gem 'jammit', '0.6.5'
9-
gem 'json', '1.8.3'
9+
gem 'json', '2.3.1'
1010
gem 'axlsx', :git => 'https://github.com/randym/axlsx.git', :branch => 'release-3.0.0'
1111
gem 'axlsx_rails'
1212

Gemfile.lock

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ GEM
8181
cocaine (0.5.8)
8282
climate_control (>= 0.0.3, < 1.0)
8383
color (1.8)
84-
concurrent-ruby (1.0.5)
84+
concurrent-ruby (1.1.6)
8585
daemons (1.2.6)
8686
devise (1.4.7)
8787
bcrypt-ruby (~> 3.0)
@@ -101,9 +101,6 @@ GEM
101101
activerecord (>= 3.0.0)
102102
hashery (2.1.2)
103103
hike (1.2.3)
104-
hoptoad_notifier (2.4.11)
105-
activesupport
106-
builder
107104
htmlentities (4.3.4)
108105
i18n (0.9.5)
109106
concurrent-ruby (~> 1.0)
@@ -112,7 +109,7 @@ GEM
112109
jammit (0.6.5)
113110
yui-compressor (>= 0.9.3)
114111
journey (1.0.4)
115-
json (1.8.3)
112+
json (2.3.1)
116113
kgio (2.11.2)
117114
launchy (2.0.5)
118115
addressable (~> 2.2.6)
@@ -130,7 +127,7 @@ GEM
130127
mini_portile2 (2.3.0)
131128
mocha (1.3.0)
132129
metaclass (~> 0.0.1)
133-
multi_json (1.13.1)
130+
multi_json (1.15.0)
134131
nokogiri (1.8.2)
135132
mini_portile2 (~> 2.3.0)
136133
orm_adapter (0.0.7)
@@ -162,7 +159,7 @@ GEM
162159
pdf-reader (>= 0.9.0)
163160
ttfunk (~> 1.0.2)
164161
rack (1.4.7)
165-
rack-cache (1.7.2)
162+
rack-cache (1.12.0)
166163
rack (>= 0.4)
167164
rack-ssl (1.3.4)
168165
rack
@@ -189,8 +186,7 @@ GEM
189186
actionpack (~> 3.0)
190187
activerecord (~> 3.0)
191188
polyamorous (~> 0.5.0)
192-
rdoc (3.12.2)
193-
json (~> 1.4)
189+
rdoc (3.9.5)
194190
rmagick (2.13.2)
195191
ruby-rc4 (0.1.5)
196192
rubyzip (1.2.1)
@@ -225,7 +221,7 @@ GEM
225221
daemons (~> 1.0, >= 1.0.9)
226222
eventmachine (~> 1.0, >= 1.0.4)
227223
rack (>= 1, < 3)
228-
thor (0.20.0)
224+
thor (1.0.1)
229225
tilt (1.4.1)
230226
transaction-simple (1.4.0.2)
231227
treetop (1.4.15)
@@ -264,10 +260,9 @@ DEPENDENCIES
264260
dynamic_form (= 1.1.4)
265261
factory_girl_rails (= 4.9)
266262
foreigner (= 1.0.3)
267-
hoptoad_notifier (= 2.4.11)
268263
intermine (~> 1.4)
269264
jammit (= 0.6.5)
270-
json (= 1.8.3)
265+
json (= 2.3.1)
271266
launchy (= 2.0.5)
272267
letter_opener
273268
mocha (= 1.3)

0 commit comments

Comments
 (0)