From 57c77fcd0ae20ac554673f4ac73e8b1d6960567a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Tue, 11 Sep 2012 20:34:36 +0200 Subject: [PATCH 01/10] bump nokogiri --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 697034b85..6db4157f5 100644 --- a/Gemfile +++ b/Gemfile @@ -80,7 +80,7 @@ gem 'rails-i18n' # parsing -gem 'nokogiri', '1.5.2' +gem 'nokogiri', '1.5.5' gem 'redcarpet', "2.1.1" gem 'roxml', :git => 'https://github.com/Empact/roxml.git', :ref => '7ea9a9ffd2338aaef5b0' gem 'ruby-oembed', '0.8.7' diff --git a/Gemfile.lock b/Gemfile.lock index 6c9f03c7d..a5b2f8acb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -284,7 +284,7 @@ GEM net-ssh (>= 1.99.1) netrc (0.7.7) newrelic_rpm (3.3.5) - nokogiri (1.5.2) + nokogiri (1.5.5) oauth (0.4.6) oauth2 (0.6.1) faraday (~> 0.7) @@ -502,7 +502,7 @@ DEPENDENCIES mobile-fu (= 1.1.0) mysql2 (= 0.3.11) newrelic_rpm (= 3.3.5) - nokogiri (= 1.5.2) + nokogiri (= 1.5.5) oink (= 0.9.3) omniauth (= 1.1.1) omniauth-facebook (= 1.3.0) From 76edd7bf7b4c2ce6d49b120dc16d7484145602cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Wed, 12 Sep 2012 17:10:27 +0200 Subject: [PATCH 02/10] bump acts_as_api --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 6db4157f5..563785d06 100644 --- a/Gemfile +++ b/Gemfile @@ -71,7 +71,7 @@ gem 'mini_magick', '3.4' # JSON and API gem 'json', '1.7.5' -gem 'acts_as_api', '0.4' +gem 'acts_as_api', '0.4.1 ' # localization diff --git a/Gemfile.lock b/Gemfile.lock index a5b2f8acb..db209fa68 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -83,7 +83,7 @@ GEM multi_json (~> 1.0) acts-as-taggable-on (2.3.3) rails (~> 3.0) - acts_as_api (0.4) + acts_as_api (0.4.1) activemodel (>= 3.0.0) activesupport (>= 3.0.0) rack (>= 1.1.0) @@ -458,7 +458,7 @@ PLATFORMS DEPENDENCIES activerecord-import (= 0.2.9) acts-as-taggable-on (= 2.3.3) - acts_as_api (= 0.4) + acts_as_api (= 0.4.1) addressable (= 2.3.2) airbrake (= 3.1.0) asset_sync (= 0.4.2) From 008651cb7e90022b109b88a723518608656dac73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Wed, 12 Sep 2012 17:11:25 +0200 Subject: [PATCH 03/10] bump factory_girl_rails --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 563785d06..a3f92eeda 100644 --- a/Gemfile +++ b/Gemfile @@ -148,7 +148,7 @@ group :test do gem 'database_cleaner', '0.8' gem 'timecop' - gem 'factory_girl_rails', '4.0.0' + gem 'factory_girl_rails', '4.1.0' gem 'fixture_builder', '0.3.4' gem 'fuubar', '1.0.0' gem 'rspec-instafail', '0.2.4', :require => false diff --git a/Gemfile.lock b/Gemfile.lock index db209fa68..031b11b1a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -159,10 +159,10 @@ GEM excon (0.14.3) execjs (1.4.0) multi_json (~> 1.0) - factory_girl (4.0.0) + factory_girl (4.1.0) activesupport (>= 3.0.0) - factory_girl_rails (4.0.0) - factory_girl (~> 4.0.0) + factory_girl_rails (4.1.0) + factory_girl (~> 4.1.0) railties (>= 3.0.0) faraday (0.8.1) multipart-post (~> 1.1) @@ -474,7 +474,7 @@ DEPENDENCIES database_cleaner (= 0.8) debugger (= 1.2.0) devise (= 2.1.2) - factory_girl_rails (= 4.0.0) + factory_girl_rails (= 4.1.0) faraday (= 0.8.1) faraday_middleware (= 0.8.7) fastercsv (= 1.5.5) From 98ba8840c7040cb96ab6a49f4becebe34ec5c96a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Wed, 12 Sep 2012 17:14:06 +0200 Subject: [PATCH 04/10] bump webmock --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a3f92eeda..27382ad80 100644 --- a/Gemfile +++ b/Gemfile @@ -154,7 +154,7 @@ group :test do gem 'rspec-instafail', '0.2.4', :require => false gem 'selenium-webdriver', '2.25.0' - gem 'webmock', '1.8.7', :require => false + gem 'webmock', '1.8.10', :require => false gem 'spork', '1.0.0rc3' gem 'guard-rspec', '0.7.3' diff --git a/Gemfile.lock b/Gemfile.lock index 031b11b1a..0e6995a82 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -444,7 +444,7 @@ GEM rack (>= 1.0.0) warden (1.2.1) rack (>= 1.0) - webmock (1.8.7) + webmock (1.8.10) addressable (>= 2.2.7) crack (>= 0.1.7) will_paginate (3.0.3) @@ -537,6 +537,6 @@ DEPENDENCIES typhoeus (= 0.3.3) uglifier (= 1.3.0) unicorn (= 4.3.1) - webmock (= 1.8.7) + webmock (= 1.8.10) will_paginate (= 3.0.3) yard (= 0.8.1) From d9851b2368b4260e5366c6ea3fc561ef7ae6d3b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Wed, 12 Sep 2012 17:19:28 +0200 Subject: [PATCH 05/10] bump yard --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 27382ad80..479e85ace 100644 --- a/Gemfile +++ b/Gemfile @@ -174,7 +174,7 @@ group :development do gem 'capistrano', '2.12.0', :require => false gem 'capistrano_colors', '0.5.5', :require => false gem 'capistrano-ext', '1.2.1', :require => false - gem 'yard', '0.8.1', :require => false + gem 'yard', '0.8.2.1', :require => false # for tracing AR object instantiation and memory usage per request gem 'oink', '0.9.3' diff --git a/Gemfile.lock b/Gemfile.lock index 0e6995a82..1151f2980 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -450,7 +450,7 @@ GEM will_paginate (3.0.3) xpath (0.1.4) nokogiri (~> 1.3) - yard (0.8.1) + yard (0.8.2.1) PLATFORMS ruby @@ -539,4 +539,4 @@ DEPENDENCIES unicorn (= 4.3.1) webmock (= 1.8.10) will_paginate (= 3.0.3) - yard (= 0.8.1) + yard (= 0.8.2.1) From bedb7d1e22bc93e11f9c074ccac096a2e05cc2ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 13 Sep 2012 18:08:13 +0200 Subject: [PATCH 06/10] bump activerecord-import --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 479e85ace..078434887 100644 --- a/Gemfile +++ b/Gemfile @@ -56,7 +56,7 @@ end gem 'settingslogic', :git => 'https://github.com/binarylogic/settingslogic.git' # database -gem "activerecord-import", "0.2.9" +gem "activerecord-import", "0.2.10" gem 'foreigner', '1.2.1' 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 1151f2980..24c2218e6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,7 +72,7 @@ GEM activesupport (= 3.2.8) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activerecord-import (0.2.9) + activerecord-import (0.2.10) activerecord (~> 3.0) activerecord (~> 3.0) activeresource (3.2.8) @@ -456,7 +456,7 @@ PLATFORMS ruby DEPENDENCIES - activerecord-import (= 0.2.9) + activerecord-import (= 0.2.10) acts-as-taggable-on (= 2.3.3) acts_as_api (= 0.4.1) addressable (= 2.3.2) From ca719893dc11a81061241db0e9a74e54991de885 Mon Sep 17 00:00:00 2001 From: Steven Hancock Date: Sat, 15 Sep 2012 01:42:27 -0700 Subject: [PATCH 07/10] Update bootstrap-sass to 2.1.0.0 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 078434887..6cb246342 100644 --- a/Gemfile +++ b/Gemfile @@ -112,7 +112,7 @@ gem 'gon', '4.0.0' # assets group :assets do - gem 'bootstrap-sass', '2.0.3.1' + gem 'bootstrap-sass', '2.1.0.0' gem 'sass-rails', '3.2.5' # Windows and OSX have an execjs compatible runtime built-in, Linux users should diff --git a/Gemfile.lock b/Gemfile.lock index 24c2218e6..7fb21172b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -97,7 +97,7 @@ GEM fog bbenezech-nested_form (0.0.6) bcrypt-ruby (3.0.1) - bootstrap-sass (2.0.3.1) + bootstrap-sass (2.1.0.0) builder (3.0.3) capistrano (2.12.0) highline @@ -462,7 +462,7 @@ DEPENDENCIES addressable (= 2.3.2) airbrake (= 3.1.0) asset_sync (= 0.4.2) - bootstrap-sass (= 2.0.3.1) + bootstrap-sass (= 2.1.0.0) bundler (> 1.1.0) capistrano (= 2.12.0) capistrano-ext (= 1.2.1) From 5fdbbe03eeb365dd6c25de9026895578ec7064d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 15 Sep 2012 14:06:04 +0200 Subject: [PATCH 08/10] bump faraday and faraday_middleware --- Gemfile | 4 ++-- Gemfile.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 6cb246342..1d7dc5ba6 100644 --- a/Gemfile +++ b/Gemfile @@ -133,8 +133,8 @@ gem 'jquery-rails', '2.0.2' # web -gem 'faraday', '0.8.1' -gem 'faraday_middleware', '0.8.7' +gem 'faraday', '0.8.4' +gem 'faraday_middleware', '0.8.8' gem 'jasmine', :git => 'https://github.com/pivotal/jasmine-gem.git' diff --git a/Gemfile.lock b/Gemfile.lock index 7fb21172b..bf66084cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -164,9 +164,9 @@ GEM factory_girl_rails (4.1.0) factory_girl (~> 4.1.0) railties (>= 3.0.0) - faraday (0.8.1) + faraday (0.8.4) multipart-post (~> 1.1) - faraday_middleware (0.8.7) + faraday_middleware (0.8.8) faraday (>= 0.7.4, < 0.9) fastercsv (1.5.5) ffi (1.1.5) @@ -475,8 +475,8 @@ DEPENDENCIES debugger (= 1.2.0) devise (= 2.1.2) factory_girl_rails (= 4.1.0) - faraday (= 0.8.1) - faraday_middleware (= 0.8.7) + faraday (= 0.8.4) + faraday_middleware (= 0.8.8) fastercsv (= 1.5.5) fixture_builder (= 0.3.4) fog (= 1.4.0) From 6d74926b9fa4ba5ae8307692e6049cc1980fd045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 15 Sep 2012 14:09:32 +0200 Subject: [PATCH 09/10] bump foreman --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 1d7dc5ba6..06cd52f44 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ ruby '1.9.3' if ENV['HEROKU'] gem 'rails', '3.2.8' -gem 'foreman', '0.57' +gem 'foreman', '0.59' gem 'thin', '1.4.1', :require => false gem 'rails_autolink', '1.0.9' diff --git a/Gemfile.lock b/Gemfile.lock index bf66084cf..2ec9ffd68 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -185,7 +185,7 @@ GEM ruby-hmac foreigner (1.2.1) activerecord (>= 3.0.0) - foreman (0.57.0) + foreman (0.59.0) thor (>= 0.13.6) formatador (0.2.3) fuubar (1.0.0) @@ -481,7 +481,7 @@ DEPENDENCIES fixture_builder (= 0.3.4) fog (= 1.4.0) foreigner (= 1.2.1) - foreman (= 0.57) + foreman (= 0.59) fuubar (= 1.0.0) gon (= 4.0.0) guard-cucumber (= 1.0.0) From 70eda773959dfd2b30c7032ae2ca9ebe2028bb4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 17 Sep 2012 21:20:41 +0200 Subject: [PATCH 10/10] bump timecop --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 06cd52f44..3bc06b3d9 100644 --- a/Gemfile +++ b/Gemfile @@ -147,7 +147,7 @@ group :test do gem 'cucumber-rails', '1.3.0', :require => false gem 'database_cleaner', '0.8' - gem 'timecop' + gem 'timecop', '0.5.1' gem 'factory_girl_rails', '4.1.0' gem 'fixture_builder', '0.3.4' gem 'fuubar', '1.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index 2ec9ffd68..a9a85153e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -421,7 +421,7 @@ GEM rack (>= 1.0.0) thor (0.16.0) tilt (1.3.3) - timecop (0.4.6) + timecop (0.5.1) treetop (1.4.10) polyglot polyglot (>= 0.3.1) @@ -532,7 +532,7 @@ DEPENDENCIES settingslogic! spork (= 1.0.0rc3) thin (= 1.4.1) - timecop + timecop (= 0.5.1) twitter (= 2.0.2) typhoeus (= 0.3.3) uglifier (= 1.3.0)