File tree Expand file tree Collapse file tree 2 files changed +8
-13
lines changed Expand file tree Collapse file tree 2 files changed +8
-13
lines changed Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ gem 'rails', '3.2.22.5'
6
6
##gem 'rack', '~> 1.5.4'
7
7
# gem 'hoptoad_notifier', '2.4.11'
8
8
gem 'jammit' , '0.6.5'
9
- gem 'json' , '1.8.3 '
9
+ gem 'json' , '2.3.1 '
10
10
gem 'axlsx' , :git => 'https://github.com/randym/axlsx.git' , :branch => 'release-3.0.0'
11
11
gem 'axlsx_rails'
12
12
Original file line number Diff line number Diff line change 81
81
cocaine (0.5.8 )
82
82
climate_control (>= 0.0.3 , < 1.0 )
83
83
color (1.8 )
84
- concurrent-ruby (1.0.5 )
84
+ concurrent-ruby (1.1.6 )
85
85
daemons (1.2.6 )
86
86
devise (1.4.7 )
87
87
bcrypt-ruby (~> 3.0 )
101
101
activerecord (>= 3.0.0 )
102
102
hashery (2.1.2 )
103
103
hike (1.2.3 )
104
- hoptoad_notifier (2.4.11 )
105
- activesupport
106
- builder
107
104
htmlentities (4.3.4 )
108
105
i18n (0.9.5 )
109
106
concurrent-ruby (~> 1.0 )
112
109
jammit (0.6.5 )
113
110
yui-compressor (>= 0.9.3 )
114
111
journey (1.0.4 )
115
- json (1.8.3 )
112
+ json (2.3.1 )
116
113
kgio (2.11.2 )
117
114
launchy (2.0.5 )
118
115
addressable (~> 2.2.6 )
130
127
mini_portile2 (2.3.0 )
131
128
mocha (1.3.0 )
132
129
metaclass (~> 0.0.1 )
133
- multi_json (1.13.1 )
130
+ multi_json (1.15.0 )
134
131
nokogiri (1.8.2 )
135
132
mini_portile2 (~> 2.3.0 )
136
133
orm_adapter (0.0.7 )
162
159
pdf-reader (>= 0.9.0 )
163
160
ttfunk (~> 1.0.2 )
164
161
rack (1.4.7 )
165
- rack-cache (1.7.2 )
162
+ rack-cache (1.12.0 )
166
163
rack (>= 0.4 )
167
164
rack-ssl (1.3.4 )
168
165
rack
189
186
actionpack (~> 3.0 )
190
187
activerecord (~> 3.0 )
191
188
polyamorous (~> 0.5.0 )
192
- rdoc (3.12.2 )
193
- json (~> 1.4 )
189
+ rdoc (3.9.5 )
194
190
rmagick (2.13.2 )
195
191
ruby-rc4 (0.1.5 )
196
192
rubyzip (1.2.1 )
225
221
daemons (~> 1.0 , >= 1.0.9 )
226
222
eventmachine (~> 1.0 , >= 1.0.4 )
227
223
rack (>= 1 , < 3 )
228
- thor (0.20.0 )
224
+ thor (1.0.1 )
229
225
tilt (1.4.1 )
230
226
transaction-simple (1.4.0.2 )
231
227
treetop (1.4.15 )
@@ -264,10 +260,9 @@ DEPENDENCIES
264
260
dynamic_form (= 1.1.4 )
265
261
factory_girl_rails (= 4.9 )
266
262
foreigner (= 1.0.3 )
267
- hoptoad_notifier (= 2.4.11 )
268
263
intermine (~> 1.4 )
269
264
jammit (= 0.6.5 )
270
- json (= 1.8.3 )
265
+ json (= 2.3.1 )
271
266
launchy (= 2.0.5 )
272
267
letter_opener
273
268
mocha (= 1.3 )
You can’t perform that action at this time.
0 commit comments