From c4b07098516146d6763a87095e4c402de2e7be3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 3 Feb 2013 13:07:45 +0100 Subject: [PATCH 01/25] bump rack-ssl --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 7ba3cc795..72c329849 100644 --- a/Gemfile +++ b/Gemfile @@ -40,7 +40,7 @@ gem 'messagebus_ruby_api', '1.0.3' group :production do # we don't install these on travis to speed up test runs gem 'rails_admin', '0.4.1' gem 'fastercsv', '1.5.5', :require => false - gem 'rack-ssl', '1.3.2', :require => 'rack/ssl' + gem 'rack-ssl', '1.3.3', :require => 'rack/ssl' gem 'rack-rewrite', '1.3.3', :require => false # analytics diff --git a/Gemfile.lock b/Gemfile.lock index ac0b67fcc..4633e56f5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -273,7 +273,7 @@ GEM rack-protection (1.2.0) rack rack-rewrite (1.3.3) - rack-ssl (1.3.2) + rack-ssl (1.3.3) rack rack-test (0.6.2) rack (>= 1.0) @@ -459,7 +459,7 @@ DEPENDENCIES rack-piwik (= 0.1.3) rack-protection (= 1.2) rack-rewrite (= 1.3.3) - rack-ssl (= 1.3.2) + rack-ssl (= 1.3.3) rails (= 3.2.12) rails-i18n (= 0.7.2) rails_admin (= 0.4.1) From 6366cf5a1dfc4eda977ce5403c14baa72aad0014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 3 Feb 2013 13:10:45 +0100 Subject: [PATCH 02/25] bump fog --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 72c329849..9cdfac74e 100644 --- a/Gemfile +++ b/Gemfile @@ -61,7 +61,7 @@ gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite' # file uploading gem 'carrierwave', '0.7.1' -gem 'fog', '1.8.0' +gem 'fog', '1.9.0' gem 'mini_magick', '3.4' # JSON and API diff --git a/Gemfile.lock b/Gemfile.lock index 4633e56f5..5be6102ea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -119,7 +119,7 @@ GEM fixture_builder (0.3.5) activerecord (>= 2) activesupport (>= 2) - fog (1.8.0) + fog (1.9.0) builder excon (~> 0.14) formatador (~> 0.2.0) @@ -429,7 +429,7 @@ DEPENDENCIES faraday_middleware (= 0.9.0) fastercsv (= 1.5.5) fixture_builder (= 0.3.5) - fog (= 1.8.0) + fog (= 1.9.0) foreigner (= 1.2.1) foreman (= 0.61) fuubar (= 1.1.0) From 2bad517ceb4471f744857124ec77809407339c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 3 Feb 2013 13:18:15 +0100 Subject: [PATCH 03/25] bump selenium-webdriver --- Gemfile | 2 +- Gemfile.lock | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 9cdfac74e..62d3b762f 100644 --- a/Gemfile +++ b/Gemfile @@ -148,7 +148,7 @@ group :test do gem 'fixture_builder', '0.3.5' gem 'fuubar', '1.1.0' gem 'rspec-instafail', '0.2.4', :require => false - gem 'selenium-webdriver', '2.27.2' + gem 'selenium-webdriver', '2.29.0' gem 'webmock', '1.8.11', :require => false diff --git a/Gemfile.lock b/Gemfile.lock index 5be6102ea..42d8e5c64 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,7 +72,7 @@ GEM carrierwave (0.7.1) activemodel (>= 3.2.0) activesupport (>= 3.2.0) - childprocess (0.3.6) + childprocess (0.3.7) ffi (~> 1.0, >= 1.0.6) client_side_validations (3.2.1) coderay (1.0.8) @@ -198,9 +198,6 @@ GEM actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.7.4) - libwebsocket (0.1.7.1) - addressable - websocket listen (0.7.2) lumberjack (1.0.2) mail (2.4.4) @@ -355,11 +352,11 @@ GEM railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.27.2) + selenium-webdriver (2.29.0) childprocess (>= 0.2.5) - libwebsocket (~> 0.1.3) multi_json (~> 1.0) rubyzip + websocket (~> 1.0.4) simple_oauth (0.2.0) sinatra (1.3.3) rack (~> 1.3, >= 1.3.6) @@ -400,7 +397,7 @@ GEM webmock (1.8.11) addressable (>= 2.2.7) crack (>= 0.1.7) - websocket (1.0.6) + websocket (1.0.7) will_paginate (3.0.4) xpath (0.1.4) nokogiri (~> 1.3) @@ -476,7 +473,7 @@ DEPENDENCIES rspec-rails (= 2.12.2) ruby-oembed (= 0.8.8) sass-rails (= 3.2.6) - selenium-webdriver (= 2.27.2) + selenium-webdriver (= 2.29.0) spork (= 1.0.0rc3) timecop (= 0.5.9) twitter (= 4.4.4) From 7337dd797221728a98456c13ef66100ce740590f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 3 Feb 2013 13:22:10 +0100 Subject: [PATCH 04/25] bump carrierwave --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 62d3b762f..f119ccead 100644 --- a/Gemfile +++ b/Gemfile @@ -60,7 +60,7 @@ gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite' # file uploading -gem 'carrierwave', '0.7.1' +gem 'carrierwave', '0.8.0' gem 'fog', '1.9.0' gem 'mini_magick', '3.4' diff --git a/Gemfile.lock b/Gemfile.lock index 42d8e5c64..5e7388ef5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -69,7 +69,7 @@ GEM rack-test (>= 0.5.4) selenium-webdriver (~> 2.0) xpath (~> 0.1.4) - carrierwave (0.7.1) + carrierwave (0.8.0) activemodel (>= 3.2.0) activesupport (>= 3.2.0) childprocess (0.3.7) @@ -415,7 +415,7 @@ DEPENDENCIES capistrano (= 2.12.0) capistrano_colors (= 0.5.5) capybara (= 1.1.3) - carrierwave (= 0.7.1) + carrierwave (= 0.8.0) client_side_validations (= 3.2.1) configurate (= 0.0.2) cucumber-rails (= 1.3.0) From 8d7073a4755812055ea8f9ccefc08e018b072bfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 3 Feb 2013 13:26:15 +0100 Subject: [PATCH 05/25] bump factory_girl_rails --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index f119ccead..171edac2a 100644 --- a/Gemfile +++ b/Gemfile @@ -144,7 +144,7 @@ group :test do gem 'database_cleaner', '0.9.1' gem 'timecop', '0.5.9' - gem 'factory_girl_rails', '4.1.0' + gem 'factory_girl_rails', '4.2.1' gem 'fixture_builder', '0.3.5' gem 'fuubar', '1.1.0' gem 'rspec-instafail', '0.2.4', :require => false diff --git a/Gemfile.lock b/Gemfile.lock index 5e7388ef5..3f6bf3b02 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -105,10 +105,10 @@ GEM excon (0.16.10) execjs (1.4.0) multi_json (~> 1.0) - factory_girl (4.1.0) + factory_girl (4.2.0) activesupport (>= 3.0.0) - factory_girl_rails (4.1.0) - factory_girl (~> 4.1.0) + factory_girl_rails (4.2.1) + factory_girl (~> 4.2.0) railties (>= 3.0.0) faraday (0.8.4) multipart-post (~> 1.1) @@ -421,7 +421,7 @@ DEPENDENCIES cucumber-rails (= 1.3.0) database_cleaner (= 0.9.1) devise (= 2.1.3) - factory_girl_rails (= 4.1.0) + factory_girl_rails (= 4.2.1) faraday (= 0.8.4) faraday_middleware (= 0.9.0) fastercsv (= 1.5.5) From cc3f470502d596731a8ba69f2e43ddb275139b6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 3 Feb 2013 13:28:45 +0100 Subject: [PATCH 06/25] bump rails_admin and haml --- Gemfile | 4 ++-- Gemfile.lock | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 171edac2a..2d92d4c01 100644 --- a/Gemfile +++ b/Gemfile @@ -38,7 +38,7 @@ gem 'markerb', '1.0.1' gem 'messagebus_ruby_api', '1.0.3' group :production do # we don't install these on travis to speed up test runs - gem 'rails_admin', '0.4.1' + gem 'rails_admin', '0.4.5' gem 'fastercsv', '1.5.5', :require => false gem 'rack-ssl', '1.3.3', :require => 'rack/ssl' gem 'rack-rewrite', '1.3.3', :require => false @@ -98,7 +98,7 @@ gem 'typhoeus', '0.3.3' # views -gem 'haml', '3.1.7' +gem 'haml', '4.0.0' gem 'mobile-fu', '1.1.1' gem 'will_paginate', '3.0.4' diff --git a/Gemfile.lock b/Gemfile.lock index 3f6bf3b02..7379fcbe6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -129,7 +129,7 @@ GEM net-ssh (>= 2.1.3) nokogiri (~> 1.5.0) ruby-hmac - font-awesome-sass-rails (3.0.0.1) + font-awesome-sass-rails (3.0.2.1) railties (>= 3.1.1) sass-rails (>= 3.1.1) foreigner (1.2.1) @@ -161,7 +161,8 @@ GEM childprocess (>= 0.2.3) guard (>= 1.1) spork (>= 0.8.4) - haml (3.1.7) + haml (4.0.0) + tilt handlebars_assets (0.8.2) execjs (>= 1.2.9) sprockets (>= 2.0.3) @@ -284,19 +285,20 @@ GEM railties (= 3.2.12) rails-i18n (0.7.2) i18n (~> 0.5) - rails_admin (0.4.1) - bootstrap-sass (~> 2.1) + rails_admin (0.4.5) + bootstrap-sass (~> 2.2) builder (~> 3.0) coffee-rails (~> 3.1) font-awesome-sass-rails (~> 3.0, >= 3.0.0.1) - haml (~> 3.1) + haml (~> 4.0) jquery-rails (~> 2.1) jquery-ui-rails (~> 3.0) kaminari (~> 0.14) - nested_form (~> 0.2) + nested_form (~> 0.3) rack-pjax (~> 0.6) rails (~> 3.1) remotipart (~> 1.0) + safe_yaml (~> 0.6) sass-rails (~> 3.1) rails_autolink (1.0.9) rails (~> 3.1) @@ -347,6 +349,7 @@ GEM ruby-oembed (0.8.8) ruby-progressbar (1.0.2) rubyzip (0.9.9) + safe_yaml (0.8.0) sass (3.2.5) sass-rails (3.2.6) railties (~> 3.2.0) @@ -434,7 +437,7 @@ DEPENDENCIES guard-cucumber (= 1.3.2) guard-rspec (= 2.3.3) guard-spork (= 1.4.1) - haml (= 3.1.7) + haml (= 4.0.0) handlebars_assets (= 0.8.2) http_accept_language (= 1.0.2) i18n-inflector-rails (~> 1.0) @@ -459,7 +462,7 @@ DEPENDENCIES rack-ssl (= 1.3.3) rails (= 3.2.12) rails-i18n (= 0.7.2) - rails_admin (= 0.4.1) + rails_admin (= 0.4.5) rails_autolink (= 1.0.9) rb-fsevent (= 0.9.3) rb-inotify (= 0.9.0) From 70804a2f774ece38d0ceb211e8f56f7998086c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 3 Feb 2013 13:30:34 +0100 Subject: [PATCH 07/25] bump timecop --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 2d92d4c01..fb4f39822 100644 --- a/Gemfile +++ b/Gemfile @@ -143,7 +143,7 @@ group :test do gem 'cucumber-rails', '1.3.0', :require => false gem 'database_cleaner', '0.9.1' - gem 'timecop', '0.5.9' + gem 'timecop', '0.5.9.2' gem 'factory_girl_rails', '4.2.1' gem 'fixture_builder', '0.3.5' gem 'fuubar', '1.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index 7379fcbe6..3edfc9a9a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -375,7 +375,7 @@ GEM subexec (0.2.2) thor (0.17.0) tilt (1.3.3) - timecop (0.5.9) + timecop (0.5.9.2) treetop (1.4.12) polyglot polyglot (>= 0.3.1) @@ -478,7 +478,7 @@ DEPENDENCIES sass-rails (= 3.2.6) selenium-webdriver (= 2.29.0) spork (= 1.0.0rc3) - timecop (= 0.5.9) + timecop (= 0.5.9.2) twitter (= 4.4.4) typhoeus (= 0.3.3) uglifier (= 1.3.0) From de7acb1579ff0b91322e8f88858f12dd66fae6aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 3 Feb 2013 13:32:51 +0100 Subject: [PATCH 08/25] bump guard --- Gemfile | 4 ++-- Gemfile.lock | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index fb4f39822..ec8800e3c 100644 --- a/Gemfile +++ b/Gemfile @@ -153,8 +153,8 @@ group :test do gem 'webmock', '1.8.11', :require => false gem 'spork', '1.0.0rc3' - gem 'guard-rspec', '2.3.3' - gem 'guard-spork', '1.4.1' + gem 'guard-rspec', '2.4.0' + gem 'guard-spork', '1.4.2' gem 'guard-cucumber', '1.3.2' gem 'rb-inotify', '0.9.0', :require => false gem 'rb-fsevent', '0.9.3', :require => false diff --git a/Gemfile.lock b/Gemfile.lock index 3edfc9a9a..12b16049b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,8 +72,8 @@ GEM carrierwave (0.8.0) activemodel (>= 3.2.0) activesupport (>= 3.2.0) - childprocess (0.3.7) - ffi (~> 1.0, >= 1.0.6) + childprocess (0.3.8) + ffi (~> 1.0, >= 1.0.11) client_side_validations (3.2.1) coderay (1.0.8) coffee-rails (3.2.2) @@ -146,18 +146,19 @@ GEM gon (4.0.2) actionpack (>= 2.3.0) json - guard (1.6.1) + guard (1.6.2) listen (>= 0.6.0) lumberjack (>= 1.0.2) pry (>= 0.9.10) + terminal-table (>= 1.4.3) thor (>= 0.14.6) guard-cucumber (1.3.2) cucumber (>= 1.2.0) guard (>= 1.1.0) - guard-rspec (2.3.3) + guard-rspec (2.4.0) guard (>= 1.1) rspec (~> 2.11) - guard-spork (1.4.1) + guard-spork (1.4.2) childprocess (>= 0.2.3) guard (>= 1.1) spork (>= 0.8.4) @@ -252,7 +253,7 @@ GEM omniauth-oauth (~> 1.0) orm_adapter (0.4.0) polyglot (0.3.3) - pry (0.9.11.1) + pry (0.9.12) coderay (~> 1.0.5) method_source (~> 0.8) slop (~> 3.4) @@ -337,7 +338,7 @@ GEM rspec-expectations (2.12.1) diff-lcs (~> 1.1.3) rspec-instafail (0.2.4) - rspec-mocks (2.12.1) + rspec-mocks (2.12.2) rspec-rails (2.12.2) actionpack (>= 3.0) activesupport (>= 3.0) @@ -373,6 +374,7 @@ GEM rack (~> 1.0) tilt (~> 1.1, != 1.3.0) subexec (0.2.2) + terminal-table (1.4.5) thor (0.17.0) tilt (1.3.3) timecop (0.5.9.2) @@ -435,8 +437,8 @@ DEPENDENCIES fuubar (= 1.1.0) gon (= 4.0.2) guard-cucumber (= 1.3.2) - guard-rspec (= 2.3.3) - guard-spork (= 1.4.1) + guard-rspec (= 2.4.0) + guard-spork (= 1.4.2) haml (= 4.0.0) handlebars_assets (= 0.8.2) http_accept_language (= 1.0.2) From 5cac4ce5d7e75082fb91c1ab1ad5799370988b7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 3 Feb 2013 13:37:16 +0100 Subject: [PATCH 09/25] bump gherkin --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 12b16049b..c7fbaf16d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -141,8 +141,8 @@ GEM rspec (~> 2.0) rspec-instafail (~> 0.2.0) ruby-progressbar (~> 1.0.0) - gherkin (2.11.5) - json (>= 1.4.6) + gherkin (2.11.6) + json (>= 1.7.6) gon (4.0.2) actionpack (>= 2.3.0) json From 9a90a799e65ff0e5cc7290dd6248318e0fdf44bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 3 Feb 2013 13:43:14 +0100 Subject: [PATCH 10/25] bump twitter --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index ec8800e3c..3a7639598 100644 --- a/Gemfile +++ b/Gemfile @@ -30,7 +30,7 @@ gem 'omniauth-facebook', '1.4.1' gem 'omniauth-tumblr', '1.1' gem 'omniauth-twitter', '0.0.14' -gem 'twitter', '4.4.4' +gem 'twitter', '4.5.0' # mail diff --git a/Gemfile.lock b/Gemfile.lock index c7fbaf16d..b6830f8a5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -381,7 +381,7 @@ GEM treetop (1.4.12) polyglot polyglot (>= 0.3.1) - twitter (4.4.4) + twitter (4.5.0) faraday (~> 0.8, < 0.10) multi_json (~> 1.0) simple_oauth (~> 0.2) @@ -481,7 +481,7 @@ DEPENDENCIES selenium-webdriver (= 2.29.0) spork (= 1.0.0rc3) timecop (= 0.5.9.2) - twitter (= 4.4.4) + twitter (= 4.5.0) typhoeus (= 0.3.3) uglifier (= 1.3.0) unicorn (= 4.5.0) From 1749cfd6284875e50c836237d93f475d6a035cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 3 Feb 2013 13:52:31 +0100 Subject: [PATCH 11/25] bump kgio --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b6830f8a5..3bdec767d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -199,7 +199,7 @@ GEM kaminari (0.14.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - kgio (2.7.4) + kgio (2.8.0) listen (0.7.2) lumberjack (1.0.2) mail (2.4.4) From 9fdd1d41197fb091d896cd4abccc706bca91212e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 3 Feb 2013 13:54:19 +0100 Subject: [PATCH 12/25] bump crack --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3bdec767d..ed04f8f2b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -84,7 +84,7 @@ GEM execjs coffee-script-source (1.4.0) configurate (0.0.2) - crack (0.3.1) + crack (0.3.2) cucumber (1.2.1) builder (>= 2.1.2) diff-lcs (>= 1.1.3) From e723d9f3d1540c562c125cb16adb661d3752cb94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 3 Feb 2013 14:01:33 +0100 Subject: [PATCH 13/25] bump foreigner --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 3a7639598..1153f45a6 100644 --- a/Gemfile +++ b/Gemfile @@ -53,7 +53,7 @@ end # database gem "activerecord-import", "0.2.11" -gem 'foreigner', '1.2.1' +gem 'foreigner', '1.3.0' gem 'mysql2', '0.3.11' if ENV['DB'].nil? || ENV['DB'] == 'all' || ENV['DB'] == 'mysql' gem 'pg', '0.14.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres' gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite' diff --git a/Gemfile.lock b/Gemfile.lock index ed04f8f2b..e2f728688 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -132,7 +132,7 @@ GEM font-awesome-sass-rails (3.0.2.1) railties (>= 3.1.1) sass-rails (>= 3.1.1) - foreigner (1.2.1) + foreigner (1.3.0) activerecord (>= 3.0.0) foreman (0.61.0) thor (>= 0.13.6) @@ -432,7 +432,7 @@ DEPENDENCIES fastercsv (= 1.5.5) fixture_builder (= 0.3.5) fog (= 1.9.0) - foreigner (= 1.2.1) + foreigner (= 1.3.0) foreman (= 0.61) fuubar (= 1.1.0) gon (= 4.0.2) From ac866a321d61b22c575b795cbd8119136da30481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Rodr=C3=ADguez?= Date: Tue, 12 Feb 2013 14:38:35 -0200 Subject: [PATCH 14/25] remove fastercsv form Gemfile & Gemfile.lock --- Gemfile | 1 - Gemfile.lock | 2 -- 2 files changed, 3 deletions(-) diff --git a/Gemfile b/Gemfile index 1153f45a6..e8a31017e 100644 --- a/Gemfile +++ b/Gemfile @@ -39,7 +39,6 @@ gem 'messagebus_ruby_api', '1.0.3' group :production do # we don't install these on travis to speed up test runs gem 'rails_admin', '0.4.5' - gem 'fastercsv', '1.5.5', :require => false gem 'rack-ssl', '1.3.3', :require => 'rack/ssl' gem 'rack-rewrite', '1.3.3', :require => false diff --git a/Gemfile.lock b/Gemfile.lock index e2f728688..e61673fde 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -114,7 +114,6 @@ GEM multipart-post (~> 1.1) faraday_middleware (0.9.0) faraday (>= 0.7.4, < 0.9) - fastercsv (1.5.5) ffi (1.3.1) fixture_builder (0.3.5) activerecord (>= 2) @@ -429,7 +428,6 @@ DEPENDENCIES factory_girl_rails (= 4.2.1) faraday (= 0.8.4) faraday_middleware (= 0.9.0) - fastercsv (= 1.5.5) fixture_builder (= 0.3.5) fog (= 1.9.0) foreigner (= 1.3.0) From de112300ca7f899b4b39b9ad29a753cddf62f433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Rodr=C3=ADguez?= Date: Tue, 12 Feb 2013 14:41:09 -0200 Subject: [PATCH 15/25] remove use csv instead of fastercsv --- lib/csv_generator.rb | 9 ++------- lib/rake_helpers.rb | 10 ++-------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/lib/csv_generator.rb b/lib/csv_generator.rb index e1fa8cb17..0f99f1fd2 100644 --- a/lib/csv_generator.rb +++ b/lib/csv_generator.rb @@ -197,14 +197,9 @@ SQL # ---------------- HELPER METHODS ------------------------- def self.load_waiting_list_csv(filename) + require 'csv' csv = filename - if RUBY_VERSION.include? "1.8" - require 'fastercsv' - people = FasterCSV.read(csv) - else - require 'csv' - people = CSV.read(csv) - end + people = CSV.read(csv) people end diff --git a/lib/rake_helpers.rb b/lib/rake_helpers.rb index 47cd7aed6..20284cb40 100644 --- a/lib/rake_helpers.rb +++ b/lib/rake_helpers.rb @@ -4,14 +4,8 @@ module RakeHelpers def process_emails(csv, num_to_process, offset, test=true) - if RUBY_VERSION.include? "1.8" - - require 'fastercsv' - backers = FasterCSV.read(csv) - else - require 'csv' - backers = CSV.read(csv) - end + require 'csv' + backers = CSV.read(csv) puts "DRY RUN" if test churn_through = 0 num_to_process.times do |n| From 8d7dd965d85bd6645e079ca84b31b9d3a5ec9d29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Rodr=C3=ADguez?= Date: Tue, 12 Feb 2013 21:59:49 -0200 Subject: [PATCH 16/25] update handlebars_assets to 0.10.0 --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index e8a31017e..429f019d1 100644 --- a/Gemfile +++ b/Gemfile @@ -117,7 +117,7 @@ group :assets do # gem 'therubyracer', :platform => :ruby - gem 'handlebars_assets', '0.8.2' + gem 'handlebars_assets', '0.10.0' gem 'uglifier', '1.3.0' gem "asset_sync", '0.5.4', :require => false diff --git a/Gemfile.lock b/Gemfile.lock index e61673fde..40835379b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -163,7 +163,7 @@ GEM spork (>= 0.8.4) haml (4.0.0) tilt - handlebars_assets (0.8.2) + handlebars_assets (0.10.0) execjs (>= 1.2.9) sprockets (>= 2.0.3) tilt @@ -215,7 +215,7 @@ GEM mobile-fu (1.1.1) rack-mobile-detect rails - multi_json (1.5.1) + multi_json (1.6.0) multipart-post (1.1.5) mysql2 (0.3.11) nested_form (0.3.1) @@ -438,7 +438,7 @@ DEPENDENCIES guard-rspec (= 2.4.0) guard-spork (= 1.4.2) haml (= 4.0.0) - handlebars_assets (= 0.8.2) + handlebars_assets (= 0.10.0) http_accept_language (= 1.0.2) i18n-inflector-rails (~> 1.0) jasmine (= 1.3.1) From d75ddbccaba31a54e41206c6cb5e8210c410419c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 15 Feb 2013 16:06:32 +0100 Subject: [PATCH 17/25] bump mutli_json --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 40835379b..c785cd2f6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -215,7 +215,7 @@ GEM mobile-fu (1.1.1) rack-mobile-detect rails - multi_json (1.6.0) + multi_json (1.6.1) multipart-post (1.1.5) mysql2 (0.3.11) nested_form (0.3.1) From 90b3fdda8e6c875da0752bcd697cdbd739a02baf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 15 Feb 2013 16:26:59 +0100 Subject: [PATCH 18/25] bump activerecord-import --- Gemfile | 2 +- Gemfile.lock | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 429f019d1..3966d9347 100644 --- a/Gemfile +++ b/Gemfile @@ -51,7 +51,7 @@ end # database -gem "activerecord-import", "0.2.11" +gem "activerecord-import", "0.3.1" gem 'foreigner', '1.3.0' gem 'mysql2', '0.3.11' if ENV['DB'].nil? || ENV['DB'] == 'all' || ENV['DB'] == 'mysql' gem 'pg', '0.14.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres' diff --git a/Gemfile.lock b/Gemfile.lock index c785cd2f6..205658490 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,8 +31,7 @@ GEM activesupport (= 3.2.12) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activerecord-import (0.2.11) - activerecord (~> 3.0) + activerecord-import (0.3.1) activerecord (~> 3.0) activeresource (3.2.12) activemodel (= 3.2.12) @@ -410,7 +409,7 @@ PLATFORMS ruby DEPENDENCIES - activerecord-import (= 0.2.11) + activerecord-import (= 0.3.1) acts-as-taggable-on (= 2.3.3) acts_as_api (= 0.4.1) addressable (= 2.3.2) From a858ad83f64274b1c2e774c6d112971d9d3e32a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 15 Feb 2013 16:34:55 +0100 Subject: [PATCH 19/25] bump faraday --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 3966d9347..7a126bfec 100644 --- a/Gemfile +++ b/Gemfile @@ -127,7 +127,7 @@ gem 'jquery-rails', '2.1.4' # web -gem 'faraday', '0.8.4' +gem 'faraday', '0.8.5' gem 'faraday_middleware', '0.9.0' diff --git a/Gemfile.lock b/Gemfile.lock index 205658490..cce11f7dd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -109,7 +109,7 @@ GEM factory_girl_rails (4.2.1) factory_girl (~> 4.2.0) railties (>= 3.0.0) - faraday (0.8.4) + faraday (0.8.5) multipart-post (~> 1.1) faraday_middleware (0.9.0) faraday (>= 0.7.4, < 0.9) @@ -425,7 +425,7 @@ DEPENDENCIES database_cleaner (= 0.9.1) devise (= 2.1.3) factory_girl_rails (= 4.2.1) - faraday (= 0.8.4) + faraday (= 0.8.5) faraday_middleware (= 0.9.0) fixture_builder (= 0.3.5) fog (= 1.9.0) From f5df8a9c905556f36380311e289e1444a02d5c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 15 Feb 2013 16:48:59 +0100 Subject: [PATCH 20/25] bump unicorn --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 7a126bfec..48b99e093 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ gem 'rails', '3.2.12' gem 'foreman', '0.61' -gem 'unicorn', '4.5.0', :require => false +gem 'unicorn', '4.6.0', :require => false gem 'rails_autolink', '1.0.9' diff --git a/Gemfile.lock b/Gemfile.lock index cce11f7dd..3d283fd6e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -389,7 +389,7 @@ GEM uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) - unicorn (4.5.0) + unicorn (4.6.0) kgio (~> 2.6) rack raindrops (~> 0.7) @@ -481,6 +481,6 @@ DEPENDENCIES twitter (= 4.5.0) typhoeus (= 0.3.3) uglifier (= 1.3.0) - unicorn (= 4.5.0) + unicorn (= 4.6.0) webmock (= 1.8.11) will_paginate (= 3.0.4) From 3ae073a2dc8aad9e33db3c591913f2828d37a890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 15 Feb 2013 16:54:36 +0100 Subject: [PATCH 21/25] bump mini_magick --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 48b99e093..e78efc7cf 100644 --- a/Gemfile +++ b/Gemfile @@ -61,7 +61,7 @@ gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite' gem 'carrierwave', '0.8.0' gem 'fog', '1.9.0' -gem 'mini_magick', '3.4' +gem 'mini_magick', '3.5' # JSON and API diff --git a/Gemfile.lock b/Gemfile.lock index 3d283fd6e..f941e5f8e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -209,7 +209,7 @@ GEM messagebus_ruby_api (1.0.3) method_source (0.8.1) mime-types (1.21) - mini_magick (3.4) + mini_magick (3.5.0) subexec (~> 0.2.1) mobile-fu (1.1.1) rack-mobile-detect @@ -445,7 +445,7 @@ DEPENDENCIES json (= 1.7.7) markerb (= 1.0.1) messagebus_ruby_api (= 1.0.3) - mini_magick (= 3.4) + mini_magick (= 3.5) mobile-fu (= 1.1.1) mysql2 (= 0.3.11) nokogiri (= 1.5.6) From 34a89a2794c18fcba7e8d128d32886c30582b183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 15 Feb 2013 17:09:32 +0100 Subject: [PATCH 22/25] bump omniauth --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index e78efc7cf..cafb2ae54 100644 --- a/Gemfile +++ b/Gemfile @@ -25,7 +25,7 @@ gem 'devise', '2.1.3' gem 'remotipart', '1.0.2' -gem 'omniauth', '1.1.1' +gem 'omniauth', '1.1.3' gem 'omniauth-facebook', '1.4.1' gem 'omniauth-tumblr', '1.1' gem 'omniauth-twitter', '0.0.14' diff --git a/Gemfile.lock b/Gemfile.lock index f941e5f8e..b32561949 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -233,7 +233,7 @@ GEM jwt (~> 0.1.4) multi_json (~> 1.0) rack (~> 1.2) - omniauth (1.1.1) + omniauth (1.1.3) hashie (~> 1.2) rack omniauth-facebook (1.4.1) @@ -449,7 +449,7 @@ DEPENDENCIES mobile-fu (= 1.1.1) mysql2 (= 0.3.11) nokogiri (= 1.5.6) - omniauth (= 1.1.1) + omniauth (= 1.1.3) omniauth-facebook (= 1.4.1) omniauth-tumblr (= 1.1) omniauth-twitter (= 0.0.14) From 2ae4d104314b4ac4a9070561508193e57d8c69d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 15 Feb 2013 17:26:30 +0100 Subject: [PATCH 23/25] bump remotipart --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index cafb2ae54..9568b2ad8 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ gem 'rack-protection', '1.2' gem 'devise', '2.1.3' -gem 'remotipart', '1.0.2' +gem 'remotipart', '1.0.5' gem 'omniauth', '1.1.3' gem 'omniauth-facebook', '1.4.1' diff --git a/Gemfile.lock b/Gemfile.lock index b32561949..b954152b2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -319,7 +319,7 @@ GEM redis (3.0.2) redis-namespace (1.2.1) redis (~> 3.0.0) - remotipart (1.0.2) + remotipart (1.0.5) resque (1.23.0) multi_json (~> 1.0) redis-namespace (~> 1.0) @@ -466,7 +466,7 @@ DEPENDENCIES rb-fsevent (= 0.9.3) rb-inotify (= 0.9.0) redcarpet (= 2.2.2) - remotipart (= 1.0.2) + remotipart (= 1.0.5) resque (= 1.23.0) resque-timeout (= 1.0.0) rmagick (= 2.13.2) From 79d4751d73500a4f892329cbca92b9c521bb9603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 17 Feb 2013 12:38:06 +0100 Subject: [PATCH 24/25] bump ffi --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b954152b2..5d954f837 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -113,7 +113,7 @@ GEM multipart-post (~> 1.1) faraday_middleware (0.9.0) faraday (>= 0.7.4, < 0.9) - ffi (1.3.1) + ffi (1.4.0) fixture_builder (0.3.5) activerecord (>= 2) activesupport (>= 2) From 131fdd4b2fe2afd6898888dbb460b6f7b4b136f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 17 Feb 2013 12:46:17 +0100 Subject: [PATCH 25/25] bump handlebars_assets --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 9568b2ad8..c651c9c95 100644 --- a/Gemfile +++ b/Gemfile @@ -117,7 +117,7 @@ group :assets do # gem 'therubyracer', :platform => :ruby - gem 'handlebars_assets', '0.10.0' + gem 'handlebars_assets', '0.11.0' gem 'uglifier', '1.3.0' gem "asset_sync", '0.5.4', :require => false diff --git a/Gemfile.lock b/Gemfile.lock index 5d954f837..fe94fab4a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -162,7 +162,7 @@ GEM spork (>= 0.8.4) haml (4.0.0) tilt - handlebars_assets (0.10.0) + handlebars_assets (0.11.0) execjs (>= 1.2.9) sprockets (>= 2.0.3) tilt @@ -437,7 +437,7 @@ DEPENDENCIES guard-rspec (= 2.4.0) guard-spork (= 1.4.2) haml (= 4.0.0) - handlebars_assets (= 0.10.0) + handlebars_assets (= 0.11.0) http_accept_language (= 1.0.2) i18n-inflector-rails (~> 1.0) jasmine (= 1.3.1)