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