Download as
Browse Code »

Commit c84a9925af21020a96f4da7b34ce333c652c6076

Authored by Nathan Broadbent
1 parent c89e6f48
Exists in master and in 1 other branch production

Use yajl-ruby gem instead of json

Showing 2 changed files with 4 additions and 3 deletions   Show diff stats
@@ -31,7 +31,7 @@ platform :ruby do @@ -31,7 +31,7 @@ platform :ruby do
31 end 31 end
32 32
33 gem 'ri_cal' 33 gem 'ri_cal'
34 -gem 'json', '~> 1.4.6' 34 +gem 'yajl-ruby'
35 35
36 group :development, :test do 36 group :development, :test do
37 gem 'rspec-rails', '~> 2.6' 37 gem 'rspec-rails', '~> 2.6'
@@ -85,7 +85,7 @@ GEM @@ -85,7 +85,7 @@ GEM
85 has_scope (~> 0.5.0) 85 has_scope (~> 0.5.0)
86 responders (~> 0.6) 86 responders (~> 0.6)
87 journey (1.0.3) 87 journey (1.0.3)
88 - json (1.4.6) 88 + json (1.7.3)
89 kaminari (0.13.0) 89 kaminari (0.13.0)
90 actionpack (>= 3.0.0) 90 actionpack (>= 3.0.0)
91 activesupport (>= 3.0.0) 91 activesupport (>= 3.0.0)
@@ -219,6 +219,7 @@ GEM @@ -219,6 +219,7 @@ GEM
219 webmock (1.8.6) 219 webmock (1.8.6)
220 addressable (>= 2.2.7) 220 addressable (>= 2.2.7)
221 crack (>= 0.1.7) 221 crack (>= 0.1.7)
  222 + yajl-ruby (1.1.0)
222 223
223 PLATFORMS 224 PLATFORMS
224 ruby 225 ruby
@@ -238,7 +239,6 @@ DEPENDENCIES @@ -238,7 +239,6 @@ DEPENDENCIES
238 hoptoad_notifier (~> 2.4) 239 hoptoad_notifier (~> 2.4)
239 htmlentities (~> 4.3.0) 240 htmlentities (~> 4.3.0)
240 inherited_resources 241 inherited_resources
241 - json (~> 1.4.6)  
242 kaminari 242 kaminari
243 lighthouse-api 243 lighthouse-api
244 mongo (= 1.3.1) 244 mongo (= 1.3.1)
@@ -261,3 +261,4 @@ DEPENDENCIES @@ -261,3 +261,4 @@ DEPENDENCIES
261 unicorn 261 unicorn
262 useragent (~> 0.3.1) 262 useragent (~> 0.3.1)
263 webmock 263 webmock
  264 + yajl-ruby