diff --git a/Gemfile.lock b/Gemfile.lock index 06fd266c..30ca762b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,9 +48,9 @@ PATH httparty (~> 0.8.1) jquery-rails (~> 1.0.16) kaminari (~> 0.13.0) - locomotive-aloha-rails (~> 0.20.1.1) + locomotive-aloha-rails (~> 0.20.1.2) locomotive-mongoid-tree (~> 0.6.2) - locomotive-tinymce-rails (~> 3.4.7.1) + locomotive-tinymce-rails (~> 3.4.7.2) locomotive_liquid (= 2.2.2) mimetype-fu (~> 0.1.2) mongo (~> 1.5.2) @@ -112,7 +112,7 @@ GEM rack-test (>= 0.5.4) selenium-webdriver (~> 2.0) xpath (~> 0.1.4) - carrierwave (0.6.0) + carrierwave (0.6.2) activemodel (>= 3.2.0) activesupport (>= 3.2.0) carrierwave-mongoid (0.1.3) @@ -132,7 +132,7 @@ GEM coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.2.0) + coffee-script-source (1.3.1) cucumber (1.1.9) builder (>= 2.1.2) diff-lcs (>= 1.1.2) @@ -149,7 +149,7 @@ GEM orm_adapter (~> 0.0.3) warden (~> 1.1) diff-lcs (1.1.3) - dragonfly (0.9.11) + dragonfly (0.9.12) rack ejs (1.0.0) erubis (2.7.0) @@ -177,13 +177,13 @@ GEM formatador (0.2.1) formtastic (2.0.2) rails (~> 3.0) - fssm (0.2.8.1) + fssm (0.2.9) gherkin (2.9.3) json (>= 1.4.6) haml (3.1.4) highline (1.6.11) hike (1.2.1) - httparty (0.8.1) + httparty (0.8.2) multi_json multi_xml i18n (0.6.0) @@ -199,12 +199,14 @@ GEM kgio (2.7.4) launchy (2.1.0) addressable (~> 2.2.6) - locomotive-aloha-rails (0.20.1.1) + libwebsocket (0.1.3) + addressable + locomotive-aloha-rails (0.20.1.2) actionpack (~> 3.2.1) locomotive-mongoid-tree (0.6.2) mongoid (~> 2.0) - locomotive-tinymce-rails (3.4.7.1) - actionpack (~> 3.2.1) + locomotive-tinymce-rails (3.4.7.2) + actionpack (~> 3.0) locomotive_liquid (2.2.2) mail (2.4.4) i18n (>= 0.4.0) @@ -215,7 +217,7 @@ GEM mocha (0.9.12) mongo (1.5.2) bson (= 1.5.2) - mongoid (2.4.7) + mongoid (2.4.8) activemodel (~> 3.1) mongo (~> 1.3) tzinfo (~> 0.3.22) @@ -280,7 +282,7 @@ GEM railties (>= 3.0) rspec (~> 2.8.0) ruby-hmac (0.4.0) - rubyzip (0.9.6.1) + rubyzip (0.9.7) sanitize (2.0.3) nokogiri (>= 1.4.4, < 1.6) sass (3.1.15) @@ -288,9 +290,10 @@ GEM railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.20.0) + selenium-webdriver (2.21.0) childprocess (>= 0.2.5) ffi (~> 1.0) + libwebsocket (~> 0.1.3) multi_json (~> 1.0) rubyzip shoulda-matchers (1.0.0) @@ -304,7 +307,7 @@ GEM treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.32) + tzinfo (0.3.33) uglifier (1.2.4) execjs (>= 0.3.0) multi_json (>= 1.0.2) diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec index 674e31d3..d6af690e 100755 --- a/locomotive_cms.gemspec +++ b/locomotive_cms.gemspec @@ -38,8 +38,8 @@ Gem::Specification.new do |s| s.add_dependency 'jquery-rails', '~> 1.0.16' s.add_dependency 'rails-backbone', '~> 0.6.1' s.add_dependency 'codemirror-rails', '~> 2.21' - s.add_dependency 'locomotive-tinymce-rails', '~> 3.4.7.1' - s.add_dependency 'locomotive-aloha-rails', '~> 0.20.1.1' + s.add_dependency 'locomotive-tinymce-rails', '~> 3.4.7.2' + s.add_dependency 'locomotive-aloha-rails', '~> 0.20.1.2' s.add_dependency 'flash_cookie_session', '~> 1.1.1' s.add_dependency 'locomotive_liquid', '2.2.2'