diff --git a/Gemfile.lock b/Gemfile.lock index 9b36dfda..1c2ab25f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,7 +38,7 @@ PATH httparty (~> 0.8.1) jquery-rails (~> 1.0.16) kaminari (~> 0.13.0) - locomotive-aloha-rails (~> 0.20.1.3) + locomotive-aloha-rails (~> 0.20.1.4) locomotive-mongoid-tree (~> 0.6.2) locomotive-tinymce-rails (~> 3.4.7.2) locomotive_liquid (= 2.2.2) @@ -178,8 +178,8 @@ GEM haml (3.1.4) highline (1.6.11) hike (1.2.1) - httparty (0.8.2) - multi_json + httparty (0.8.3) + multi_json (~> 1.0) multi_xml i18n (0.6.0) journey (1.0.3) @@ -199,7 +199,7 @@ GEM addressable (~> 2.2.6) libwebsocket (0.1.3) addressable - locomotive-aloha-rails (0.20.1.3) + locomotive-aloha-rails (0.20.1.4) actionpack (~> 3.2.1) locomotive-mongoid-tree (0.6.2) mongoid (~> 2.0) diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec index a4e74043..e5d6d902 100755 --- a/locomotive_cms.gemspec +++ b/locomotive_cms.gemspec @@ -39,7 +39,7 @@ Gem::Specification.new do |s| s.add_dependency 'rails-backbone', '~> 0.6.1' s.add_dependency 'codemirror-rails', '~> 2.21' s.add_dependency 'locomotive-tinymce-rails', '~> 3.4.7.2' - s.add_dependency 'locomotive-aloha-rails', '~> 0.20.1.3' + s.add_dependency 'locomotive-aloha-rails', '~> 0.20.1.4' s.add_dependency 'flash_cookie_session', '~> 1.1.1' s.add_dependency 'locomotive_liquid', '2.2.2'