Commit 45c1e14878c5f80c403d32cbb560721d0f2c7b77

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

Pegged json to 1.4.6 (getting strange errors: symbol lookup error: /home/vagrant…

…/.rvm/gems/ruby-1.9.3-p194/gems/json-1.7.1/lib/json/ext/parser.so: undefined symbol: capi_get_constant)
Showing 2 changed files with 3 additions and 1 deletions   Show diff stats
@@ -31,6 +31,7 @@ platform :ruby do @@ -31,6 +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 35
35 group :development, :test do 36 group :development, :test do
36 gem 'rspec-rails', '~> 2.6' 37 gem 'rspec-rails', '~> 2.6'
@@ -76,7 +76,7 @@ GEM @@ -76,7 +76,7 @@ GEM
76 has_scope (~> 0.5.0) 76 has_scope (~> 0.5.0)
77 responders (~> 0.6) 77 responders (~> 0.6)
78 journey (1.0.3) 78 journey (1.0.3)
79 - json (1.7.1) 79 + json (1.4.6)
80 kaminari (0.13.0) 80 kaminari (0.13.0)
81 actionpack (>= 3.0.0) 81 actionpack (>= 3.0.0)
82 activesupport (>= 3.0.0) 82 activesupport (>= 3.0.0)
@@ -221,6 +221,7 @@ DEPENDENCIES @@ -221,6 +221,7 @@ DEPENDENCIES
221 hoptoad_notifier (~> 2.4) 221 hoptoad_notifier (~> 2.4)
222 htmlentities (~> 4.3.0) 222 htmlentities (~> 4.3.0)
223 inherited_resources 223 inherited_resources
  224 + json (~> 1.4.6)
224 kaminari 225 kaminari
225 lighthouse-api 226 lighthouse-api
226 mongo (= 1.3.1) 227 mongo (= 1.3.1)