diff --git a/Gemfile b/Gemfile index ea1151118..f5aeab9e4 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ gem 'rails', '3.2.13' # Appserver -gem 'unicorn', '4.6.0', :require => false +gem 'unicorn', '4.6.2', :require => false # API and JSON @@ -36,12 +36,12 @@ gem 'mysql2', '0.3.11' if ENV['DB'] == 'all' || ENV['DB'] == 'mysql' gem 'pg', '0.14.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres' gem 'activerecord-import', '0.3.1' -gem 'foreigner', '1.3.0' +gem 'foreigner', '1.4.0' # File uploading gem 'carrierwave', '0.8.0' -gem 'fog', '1.9.0' +gem 'fog', '1.10.0' gem 'mini_magick', '3.5' gem 'remotipart', '1.0.5' @@ -49,7 +49,7 @@ gem 'remotipart', '1.0.5' gem 'http_accept_language', '1.0.2' gem 'i18n-inflector-rails', '~> 1.0' -gem 'rails-i18n', '0.7.2' +gem 'rails-i18n', '0.7.3' # Mail @@ -58,7 +58,7 @@ gem 'messagebus_ruby_api', '1.0.3' # Parsing -gem 'nokogiri', '1.5.6' +gem 'nokogiri', '1.5.9' gem 'rails_autolink', '1.0.9' gem 'redcarpet', '2.2.2' gem 'roxml', '3.1.6' @@ -69,8 +69,8 @@ gem 'ruby-oembed', '0.8.8' gem 'omniauth', '1.1.3' gem 'omniauth-facebook', '1.4.1' gem 'omniauth-tumblr', '1.1' -gem 'omniauth-twitter', '0.0.14' -gem 'twitter', '4.5.0' +gem 'omniauth-twitter', '0.0.15' +gem 'twitter', '4.6.2' # Tags @@ -78,16 +78,16 @@ gem 'acts-as-taggable-on', '2.3.3' # URIs and HTTP -gem 'addressable', '2.3.2', :require => 'addressable/uri' -gem 'faraday', '0.8.5' +gem 'addressable', '2.3.3', :require => 'addressable/uri' +gem 'faraday', '0.8.6' gem 'faraday_middleware', '0.9.0' gem 'typhoeus', '0.3.3' # Views -gem 'client_side_validations', '3.2.1' +gem 'client_side_validations', '3.2.2' gem 'gon', '4.0.2' -gem 'haml', '4.0.0' +gem 'haml', '4.0.1' gem 'mobile-fu', '1.1.1' gem 'will_paginate', '3.0.4' @@ -108,7 +108,7 @@ group :assets do # JavaScript - gem 'handlebars_assets', '0.11.0' + gem 'handlebars_assets', '0.12.0' gem 'jquery-rails', '2.1.4' # Windows and OSX have an execjs compatible runtime built-in, Linux users should @@ -123,12 +123,12 @@ group :production do # we don't install these on travis to speed up test runs # Administration - gem 'rails_admin', '0.4.5' + gem 'rails_admin', '0.4.6' # Analytics gem 'rack-google-analytics', '0.11.0', :require => 'rack/google-analytics' - gem 'rack-piwik', '0.1.3', :require => 'rack/piwik' + gem 'rack-piwik', '0.2.2', :require => 'rack/piwik' # Click-jacking protection @@ -136,7 +136,7 @@ group :production do # we don't install these on travis to speed up test runs # Process management - gem 'foreman', '0.61' + gem 'foreman', '0.62' # Redirects @@ -161,13 +161,13 @@ group :development do # Automatic test runs gem 'guard-cucumber', '1.3.2' - gem 'guard-rspec', '2.4.0' + gem 'guard-rspec', '2.5.1' gem 'rb-fsevent', '0.9.3', :require => false gem 'rb-inotify', '0.9.0', :require => false # Preloading environment - gem 'guard-spork', '1.4.2' + gem 'guard-spork', '1.5.0' gem 'spork', '1.0.0rc3' end @@ -177,23 +177,23 @@ group :test do gem 'fixture_builder', '0.3.5' gem 'fuubar', '1.1.0' gem 'rspec-instafail', '0.2.4', :require => false - gem 'rspec-rails', '2.12.2' + gem "rspec-rails", '2.13.0' # Cucumber (integration tests) gem 'capybara', '1.1.3' - gem 'cucumber-rails', '1.3.0', :require => false + gem 'cucumber-rails', '1.3.1', :require => false gem 'database_cleaner', '0.9.1' - gem 'selenium-webdriver', '2.30.0' + gem 'selenium-webdriver', '2.31.0' # Jasmine (client side application tests (JS)) - gem 'jasmine', '1.3.1' + gem 'jasmine', '1.3.2' # General helpers gem 'factory_girl_rails', '4.2.1' - gem 'timecop', '0.5.9.2' + gem 'timecop', '0.6.1' gem 'webmock', '1.8.11', :require => false end diff --git a/Gemfile.lock b/Gemfile.lock index 097826302..2729dde58 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,7 +36,7 @@ GEM activemodel (>= 3.0.0) activesupport (>= 3.0.0) rack (>= 1.1.0) - addressable (2.3.2) + addressable (2.3.3) arel (3.0.2) asset_sync (0.5.4) activemodel @@ -62,18 +62,18 @@ GEM carrierwave (0.8.0) activemodel (>= 3.2.0) activesupport (>= 3.2.0) - childprocess (0.3.8) + childprocess (0.3.9) ffi (~> 1.0, >= 1.0.11) - chunky_png (1.2.6) - client_side_validations (3.2.1) - coderay (1.0.8) + chunky_png (1.2.7) + client_side_validations (3.2.2) + coderay (1.0.9) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.4.0) + coffee-script-source (1.6.2) compass (0.12.2) chunky_png (~> 1.2) fssm (>= 0.2.7) @@ -82,24 +82,25 @@ GEM compass (>= 0.12.2, < 0.14) configurate (0.0.2) crack (0.3.2) - cucumber (1.2.1) + cucumber (1.2.3) builder (>= 2.1.2) diff-lcs (>= 1.1.3) - gherkin (~> 2.11.0) - json (>= 1.4.6) - cucumber-rails (1.3.0) + gherkin (~> 2.11.6) + multi_json (~> 1.3) + cucumber-rails (1.3.1) capybara (>= 1.1.2) - cucumber (>= 1.1.8) + cucumber (>= 1.2.0) nokogiri (>= 1.5.0) + rails (~> 3.0) database_cleaner (0.9.1) devise (2.1.3) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) railties (~> 3.1) warden (~> 1.2.1) - diff-lcs (1.1.3) + diff-lcs (1.2.1) erubis (2.7.0) - excon (0.16.10) + excon (0.20.1) execjs (1.4.0) multi_json (~> 1.0) factory_girl (4.2.0) @@ -107,33 +108,33 @@ GEM factory_girl_rails (4.2.1) factory_girl (~> 4.2.0) railties (>= 3.0.0) - faraday (0.8.5) + faraday (0.8.6) multipart-post (~> 1.1) faraday_middleware (0.9.0) faraday (>= 0.7.4, < 0.9) - ffi (1.4.0) + ffi (1.5.0) fixture_builder (0.3.5) activerecord (>= 2) activesupport (>= 2) - fog (1.9.0) + fog (1.10.0) builder excon (~> 0.14) formatador (~> 0.2.0) mime-types multi_json (~> 1.0) - net-scp (~> 1.0.4) + net-scp (~> 1.1) net-ssh (>= 2.1.3) nokogiri (~> 1.5.0) ruby-hmac - font-awesome-sass-rails (3.0.2.1) + font-awesome-sass-rails (3.0.2.2) railties (>= 3.1.1) sass-rails (>= 3.1.1) - foreigner (1.3.0) + foreigner (1.4.0) activerecord (>= 3.0.0) - foreman (0.61.0) + foreman (0.62.0) thor (>= 0.13.6) formatador (0.2.4) - fssm (0.2.9) + fssm (0.2.10) fuubar (1.1.0) rspec (~> 2.0) rspec-instafail (~> 0.2.0) @@ -152,16 +153,16 @@ GEM guard-cucumber (1.3.2) cucumber (>= 1.2.0) guard (>= 1.1.0) - guard-rspec (2.4.0) + guard-rspec (2.5.1) guard (>= 1.1) rspec (~> 2.11) - guard-spork (1.4.2) + guard-spork (1.5.0) childprocess (>= 0.2.3) guard (>= 1.1) spork (>= 0.8.4) - haml (4.0.0) + haml (4.0.1) tilt - handlebars_assets (0.11.0) + handlebars_assets (0.12.0) execjs (>= 1.2.9) sprockets (>= 2.0.3) tilt @@ -177,7 +178,7 @@ GEM actionpack (~> 3.0) i18n-inflector (~> 2.6) railties (~> 3.0) - jasmine (1.3.1) + jasmine (1.3.2) jasmine-core (~> 1.3.1) rack (~> 1.0) rspec (>= 1.3.1) @@ -191,14 +192,14 @@ GEM jquery-rails railties (>= 3.1.0) json (1.7.7) - jwt (0.1.5) - multi_json (>= 1.0) + jwt (0.1.8) + multi_json (>= 1.5) kaminari (0.14.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.8.0) - listen (0.7.2) - lumberjack (1.0.2) + listen (0.7.3) + lumberjack (1.0.3) mail (2.5.3) i18n (>= 0.4.0) mime-types (~> 1.16) @@ -214,17 +215,17 @@ GEM rack-mobile-detect rails multi_json (1.7.1) - multipart-post (1.1.5) + multipart-post (1.2.0) mysql2 (0.3.11) nested_form (0.3.1) - net-scp (1.0.4) - net-ssh (>= 1.99.1) + net-scp (1.1.0) + net-ssh (>= 2.6.5) net-sftp (2.0.5) net-ssh (>= 2.0.9) - net-ssh (2.6.3) + net-ssh (2.6.6) net-ssh-gateway (1.1.0) net-ssh (>= 1.99.1) - nokogiri (1.5.6) + nokogiri (1.5.9) oauth (0.4.7) oauth2 (0.8.0) faraday (~> 0.8) @@ -245,7 +246,7 @@ GEM omniauth (~> 1.0) omniauth-tumblr (1.1) omniauth-oauth (~> 1.0) - omniauth-twitter (0.0.14) + omniauth-twitter (0.0.15) multi_json (~> 1.3) omniauth-oauth (~> 1.0) orm_adapter (0.4.0) @@ -263,7 +264,7 @@ GEM rack-google-analytics (0.11.0) rack-mobile-detect (0.4.0) rack - rack-piwik (0.1.3) + rack-piwik (0.2.2) rack-pjax (0.7.0) nokogiri (~> 1.5) rack (~> 1.3) @@ -282,9 +283,9 @@ GEM activesupport (= 3.2.13) bundler (~> 1.0) railties (= 3.2.13) - rails-i18n (0.7.2) + rails-i18n (0.7.3) i18n (~> 0.5) - rails_admin (0.4.5) + rails_admin (0.4.6) bootstrap-sass (~> 2.2) builder (~> 3.0) coffee-rails (~> 3.1) @@ -316,7 +317,7 @@ GEM rdoc (3.12.2) json (~> 1.4) redcarpet (2.2.2) - redis (3.0.2) + redis (3.0.3) redis-namespace (1.2.1) redis (~> 3.0.0) remotipart (1.0.5) @@ -331,33 +332,33 @@ GEM roxml (3.1.6) activesupport (>= 2.3.0) nokogiri (>= 1.3.3) - rspec (2.12.0) - rspec-core (~> 2.12.0) - rspec-expectations (~> 2.12.0) - rspec-mocks (~> 2.12.0) - rspec-core (2.12.2) - rspec-expectations (2.12.1) - diff-lcs (~> 1.1.3) + rspec (2.13.0) + rspec-core (~> 2.13.0) + rspec-expectations (~> 2.13.0) + rspec-mocks (~> 2.13.0) + rspec-core (2.13.1) + rspec-expectations (2.13.0) + diff-lcs (>= 1.1.3, < 2.0) rspec-instafail (0.2.4) - rspec-mocks (2.12.2) - rspec-rails (2.12.2) + rspec-mocks (2.13.0) + rspec-rails (2.13.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 2.12.0) - rspec-expectations (~> 2.12.0) - rspec-mocks (~> 2.12.0) + rspec-core (~> 2.13.0) + rspec-expectations (~> 2.13.0) + rspec-mocks (~> 2.13.0) ruby-hmac (0.4.0) ruby-oembed (0.8.8) ruby-progressbar (1.0.2) rubyzip (0.9.9) - safe_yaml (0.8.0) - sass (3.2.5) + safe_yaml (0.8.6) + sass (3.2.7) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.30.0) + selenium-webdriver (2.31.0) childprocess (>= 0.2.5) multi_json (~> 1.0) rubyzip @@ -367,7 +368,7 @@ GEM rack (~> 1.3, >= 1.3.6) rack-protection (~> 1.2) tilt (~> 1.3, >= 1.3.3) - slop (3.4.3) + slop (3.4.4) spork (1.0.0rc3) sprockets (2.2.2) hike (~> 1.2) @@ -378,11 +379,11 @@ GEM terminal-table (1.4.5) thor (0.17.0) tilt (1.3.6) - timecop (0.5.9.2) + timecop (0.6.1) treetop (1.4.12) polyglot polyglot (>= 0.3.1) - twitter (4.5.0) + twitter (4.6.2) faraday (~> 0.8, < 0.10) multi_json (~> 1.0) simple_oauth (~> 0.2) @@ -392,7 +393,7 @@ GEM uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) - unicorn (4.6.0) + unicorn (4.6.2) kgio (~> 2.6) rack raindrops (~> 0.7) @@ -415,36 +416,36 @@ DEPENDENCIES activerecord-import (= 0.3.1) acts-as-taggable-on (= 2.3.3) acts_as_api (= 0.4.1) - addressable (= 2.3.2) + addressable (= 2.3.3) asset_sync (= 0.5.4) bootstrap-sass (= 2.2.2.0) capistrano (= 2.12.0) capistrano_colors (= 0.5.5) capybara (= 1.1.3) carrierwave (= 0.8.0) - client_side_validations (= 3.2.1) + client_side_validations (= 3.2.2) compass-rails (= 1.0.3) configurate (= 0.0.2) - cucumber-rails (= 1.3.0) + cucumber-rails (= 1.3.1) database_cleaner (= 0.9.1) devise (= 2.1.3) factory_girl_rails (= 4.2.1) - faraday (= 0.8.5) + faraday (= 0.8.6) faraday_middleware (= 0.9.0) fixture_builder (= 0.3.5) - fog (= 1.9.0) - foreigner (= 1.3.0) - foreman (= 0.61) + fog (= 1.10.0) + foreigner (= 1.4.0) + foreman (= 0.62) fuubar (= 1.1.0) gon (= 4.0.2) guard-cucumber (= 1.3.2) - guard-rspec (= 2.4.0) - guard-spork (= 1.4.2) - haml (= 4.0.0) - handlebars_assets (= 0.11.0) + guard-rspec (= 2.5.1) + guard-spork (= 1.5.0) + haml (= 4.0.1) + handlebars_assets (= 0.12.0) http_accept_language (= 1.0.2) i18n-inflector-rails (~> 1.0) - jasmine (= 1.3.1) + jasmine (= 1.3.2) jquery-rails (= 2.1.4) json (= 1.7.7) markerb (= 1.0.1) @@ -452,21 +453,21 @@ DEPENDENCIES mini_magick (= 3.5) mobile-fu (= 1.1.1) mysql2 (= 0.3.11) - nokogiri (= 1.5.6) + nokogiri (= 1.5.9) omniauth (= 1.1.3) omniauth-facebook (= 1.4.1) omniauth-tumblr (= 1.1) - omniauth-twitter (= 0.0.14) + omniauth-twitter (= 0.0.15) pg (= 0.14.1) rack-cors (= 0.2.7) rack-google-analytics (= 0.11.0) - rack-piwik (= 0.1.3) + rack-piwik (= 0.2.2) rack-protection (= 1.2) rack-rewrite (= 1.3.3) rack-ssl (= 1.3.3) rails (= 3.2.13) - rails-i18n (= 0.7.2) - rails_admin (= 0.4.5) + rails-i18n (= 0.7.3) + rails_admin (= 0.4.6) rails_autolink (= 1.0.9) rb-fsevent (= 0.9.3) rb-inotify (= 0.9.0) @@ -477,15 +478,15 @@ DEPENDENCIES rmagick (= 2.13.2) roxml (= 3.1.6) rspec-instafail (= 0.2.4) - rspec-rails (= 2.12.2) + rspec-rails (= 2.13.0) ruby-oembed (= 0.8.8) sass-rails (= 3.2.6) - selenium-webdriver (= 2.30.0) + selenium-webdriver (= 2.31.0) spork (= 1.0.0rc3) - timecop (= 0.5.9.2) - twitter (= 4.5.0) + timecop (= 0.6.1) + twitter (= 4.6.2) typhoeus (= 0.3.3) uglifier (= 1.3.0) - unicorn (= 4.6.0) + unicorn (= 4.6.2) webmock (= 1.8.11) will_paginate (= 3.0.4)