diff --git a/Gemfile b/Gemfile index 4936acef8..d733084ef 100644 --- a/Gemfile +++ b/Gemfile @@ -78,7 +78,7 @@ gem 'entypo-rails', '2.2.2' gem 'backbone-on-rails', '1.1.1' gem 'handlebars_assets', '0.17.1' -gem 'jquery-rails', '3.1.1' +gem 'jquery-rails', '3.1.2' gem 'rails-assets-jquery', '1.11.1' # Should be kept in sync with jquery-rails gem 'js_image_paths', '0.0.1' @@ -90,7 +90,7 @@ gem 'rails-assets-perfect-scrollbar', '0.4.11' gem 'http_accept_language', '2.0.2' gem 'i18n-inflector-rails', '1.0.7' -gem 'rails-i18n', '4.0.2' +gem 'rails-i18n', '4.0.3' # Mail @@ -195,7 +195,7 @@ group :test do gem 'fixture_builder', '0.3.6' gem 'fuubar', '2.0.0' gem 'rspec-instafail', '0.2.5', :require => false - gem 'test_after_commit', '0.2.5' + gem 'test_after_commit', '0.2.6' # Cucumber (integration tests) @@ -213,7 +213,7 @@ end group :development, :test do # RSpec (unit tests, some integration tests) - gem 'rspec-rails', '3.0.2' + gem 'rspec-rails', '3.1.0' # Cucumber (integration tests) gem 'cucumber-rails', '1.4.1', :require => false diff --git a/Gemfile.lock b/Gemfile.lock index 512e96bde..27fb15667 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,8 +74,8 @@ GEM activesupport (>= 3.2.0) json (>= 1.7) mime-types (>= 1.16) - celluloid (0.15.2) - timers (~> 1.1.0) + celluloid (0.16.0) + timers (~> 4.0.0) childprocess (0.5.3) ffi (~> 1.0, >= 1.0.11) chunky_png (1.3.1) @@ -157,7 +157,7 @@ GEM fog-softlayer ipaddress (~> 0.5) nokogiri (~> 1.5, >= 1.5.11) - fog-brightbox (0.4.1) + fog-brightbox (0.5.0) fog-core (~> 1.22) fog-json inflecto @@ -216,6 +216,7 @@ GEM tilt hashie (3.3.1) hike (1.2.3) + hitimes (1.2.2) http_accept_language (2.0.2) i18n (0.6.11) i18n-inflector (2.6.7) @@ -233,7 +234,7 @@ GEM rake jasmine-core (2.0.2) jasmine-jquery-rails (2.0.3) - jquery-rails (3.1.1) + jquery-rails (3.1.2) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-ui-rails (4.2.1) @@ -347,9 +348,9 @@ GEM rails-assets-jquery (1.11.1) rails-assets-perfect-scrollbar (0.4.11) rails-assets-jquery (>= 1.10) - rails-i18n (4.0.2) + rails-i18n (4.0.3) i18n (~> 0.6) - rails (>= 4.0) + railties (~> 4.0) rails-observers (0.1.2) activemodel (~> 4.0) rails-timeago (2.11.0) @@ -390,28 +391,28 @@ GEM roxml (3.1.6) activesupport (>= 2.3.0) nokogiri (>= 1.3.3) - rspec (3.0.0) - rspec-core (~> 3.0.0) - rspec-expectations (~> 3.0.0) - rspec-mocks (~> 3.0.0) - rspec-core (3.0.4) - rspec-support (~> 3.0.0) - rspec-expectations (3.0.4) + rspec (3.1.0) + rspec-core (~> 3.1.0) + rspec-expectations (~> 3.1.0) + rspec-mocks (~> 3.1.0) + rspec-core (3.1.1) + rspec-support (~> 3.1.0) + rspec-expectations (3.1.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.0.0) + rspec-support (~> 3.1.0) rspec-instafail (0.2.5) rspec - rspec-mocks (3.0.4) - rspec-support (~> 3.0.0) - rspec-rails (3.0.2) + rspec-mocks (3.1.0) + rspec-support (~> 3.1.0) + rspec-rails (3.1.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.0.0) - rspec-expectations (~> 3.0.0) - rspec-mocks (~> 3.0.0) - rspec-support (~> 3.0.0) - rspec-support (3.0.4) + rspec-core (~> 3.1.0) + rspec-expectations (~> 3.1.0) + rspec-mocks (~> 3.1.0) + rspec-support (~> 3.1.0) + rspec-support (3.1.0) ruby-oembed (0.8.10) ruby-progressbar (1.5.1) rubyzip (1.1.6) @@ -449,19 +450,20 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.1.3) + sprockets-rails (2.1.4) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) subexec (0.2.3) systemu (2.6.4) - test_after_commit (0.2.5) + test_after_commit (0.2.6) activerecord (>= 3.2) thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) timecop (0.7.1) - timers (1.1.0) + timers (4.0.0) + hitimes treetop (1.4.15) polyglot polyglot (>= 0.3.1) @@ -537,7 +539,7 @@ DEPENDENCIES i18n-inflector-rails (= 1.0.7) jasmine (= 2.0.2) jasmine-jquery-rails (= 2.0.3) - jquery-rails (= 3.1.1) + jquery-rails (= 3.1.2) js_image_paths (= 0.0.1) json (= 1.8.1) markerb (= 1.0.2) @@ -561,7 +563,7 @@ DEPENDENCIES rails (= 4.1.5) rails-assets-jquery (= 1.11.1) rails-assets-perfect-scrollbar (= 0.4.11) - rails-i18n (= 4.0.2) + rails-i18n (= 4.0.3) rails-timeago (= 2.11.0) rails_admin (= 0.6.3) rails_autolink (= 1.1.6) @@ -571,7 +573,7 @@ DEPENDENCIES remotipart (= 1.2.1) roxml (= 3.1.6) rspec-instafail (= 0.2.5) - rspec-rails (= 3.0.2) + rspec-rails (= 3.1.0) ruby-oembed (= 0.8.10) sass-rails (= 4.0.3) selenium-webdriver (= 2.42.0) @@ -580,7 +582,7 @@ DEPENDENCIES sinatra (= 1.3.3) sinon-rails (= 1.10.3) spork (= 1.0.0rc4) - test_after_commit (= 0.2.5) + test_after_commit (= 0.2.6) timecop (= 0.7.1) twitter (= 4.8.1) typhoeus (= 0.6.9)