From dacaaca7e53c369a3f2b44bc40b7f9dab622bac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 4 Apr 2013 21:25:00 +0200 Subject: [PATCH 01/29] bump chunky_png --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 06041b025..5a49a290f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -60,7 +60,7 @@ GEM timers (>= 1.0.0) childprocess (0.3.9) ffi (~> 1.0, >= 1.0.11) - chunky_png (1.2.7) + chunky_png (1.2.8) client_side_validations (3.2.2) coderay (1.0.9) coffee-rails (3.2.2) From d136fd56e7a87488e1d7ddf8f2ab89dca900bf8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 4 Apr 2013 21:27:53 +0200 Subject: [PATCH 02/29] bump guard --- Gemfile | 4 ++-- Gemfile.lock | 17 ++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index c94151df3..77dfbbb6b 100644 --- a/Gemfile +++ b/Gemfile @@ -154,8 +154,8 @@ group :development do # Automatic test runs - gem 'guard-cucumber', '1.3.2' - gem 'guard-rspec', '2.5.1' + gem 'guard-cucumber', '1.4.0' + gem 'guard-rspec', '2.5.3' gem 'rb-fsevent', '0.9.3', :require => false gem 'rb-inotify', '0.9.0', :require => false diff --git a/Gemfile.lock b/Gemfile.lock index 5a49a290f..309c40ec7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,7 +95,7 @@ GEM orm_adapter (~> 0.1) railties (~> 3.1) warden (~> 1.2.1) - diff-lcs (1.2.1) + diff-lcs (1.2.3) erubis (2.7.0) excon (0.20.1) execjs (1.4.0) @@ -142,16 +142,16 @@ GEM gon (4.0.2) actionpack (>= 2.3.0) json - guard (1.6.2) + guard (1.7.0) + formatador (>= 0.2.4) 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) + guard-cucumber (1.4.0) cucumber (>= 1.2.0) guard (>= 1.1.0) - guard-rspec (2.5.1) + guard-rspec (2.5.3) guard (>= 1.1) rspec (~> 2.11) guard-spork (1.5.0) @@ -374,8 +374,7 @@ GEM tilt (~> 1.1, != 1.3.0) subexec (0.2.2) temple (0.6.3) - terminal-table (1.4.5) - thor (0.17.0) + thor (0.18.1) tilt (1.3.6) timecop (0.6.1) timers (1.1.0) @@ -433,8 +432,8 @@ DEPENDENCIES foreman (= 0.62) fuubar (= 1.1.0) gon (= 4.0.2) - guard-cucumber (= 1.3.2) - guard-rspec (= 2.5.1) + guard-cucumber (= 1.4.0) + guard-rspec (= 2.5.3) guard-spork (= 1.5.0) haml (= 4.0.1) handlebars_assets (= 0.12.0) From 63732d8722d80a193b968b03d4696a4f54bc3041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 4 Apr 2013 21:29:16 +0200 Subject: [PATCH 03/29] bump rake --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 309c40ec7..cabd8398b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -302,7 +302,7 @@ GEM rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) raindrops (0.10.0) - rake (10.0.3) + rake (10.0.4) rb-fsevent (0.9.3) rb-inotify (0.9.0) ffi (>= 0.5.0) From 6feb7969a3f5d7ad5a59d63bdf6ad68d69a1a9b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 4 Apr 2013 21:32:39 +0200 Subject: [PATCH 04/29] bump mime-types --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index cabd8398b..b113f7a01 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -205,7 +205,7 @@ GEM redcarpet (>= 2.0) messagebus_ruby_api (1.0.3) method_source (0.8.1) - mime-types (1.21) + mime-types (1.22) mini_magick (3.5.0) subexec (~> 0.2.1) mobile-fu (1.1.1) From cdaffbd906d3d4e5ed11ecfa33917f17ea077f78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 4 Apr 2013 21:33:19 +0200 Subject: [PATCH 05/29] bump oauth2 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b113f7a01..35fa5be85 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -220,7 +220,7 @@ GEM net-ssh (2.6.6) nokogiri (1.5.9) oauth (0.4.7) - oauth2 (0.8.0) + oauth2 (0.8.1) faraday (~> 0.8) httpauth (~> 0.1) jwt (~> 0.1.4) From 9028616bdc0f8f7958c9aa23ac1f26075942e79e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 4 Apr 2013 21:34:01 +0200 Subject: [PATCH 06/29] bump safe_yaml --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 35fa5be85..fb0d50a2e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -337,7 +337,7 @@ GEM ruby-oembed (0.8.8) ruby-progressbar (1.0.2) rubyzip (0.9.9) - safe_yaml (0.8.6) + safe_yaml (0.9.1) sass (3.2.7) sass-rails (3.2.6) railties (~> 3.2.0) From 90c294c4d5f1fdec1e26c549b5debfa24839d2c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 4 Apr 2013 21:35:16 +0200 Subject: [PATCH 07/29] bump omniauth-twitter --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 77dfbbb6b..526e149c8 100644 --- a/Gemfile +++ b/Gemfile @@ -68,7 +68,7 @@ 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.15' +gem 'omniauth-twitter', '0.0.16' gem 'twitter', '4.6.2' # Tags diff --git a/Gemfile.lock b/Gemfile.lock index fb0d50a2e..e36829d15 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -239,7 +239,7 @@ GEM omniauth (~> 1.0) omniauth-tumblr (1.1) omniauth-oauth (~> 1.0) - omniauth-twitter (0.0.15) + omniauth-twitter (0.0.16) multi_json (~> 1.3) omniauth-oauth (~> 1.0) orm_adapter (0.4.0) @@ -451,7 +451,7 @@ DEPENDENCIES omniauth (= 1.1.3) omniauth-facebook (= 1.4.1) omniauth-tumblr (= 1.1) - omniauth-twitter (= 0.0.15) + omniauth-twitter (= 0.0.16) rack-cors (= 0.2.7) rack-google-analytics (= 0.11.0) rack-piwik (= 0.2.2) From 20c5857612463484d6cecb7256a86373d7919c03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 4 Apr 2013 21:38:21 +0200 Subject: [PATCH 08/29] bump client_side_validations --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 526e149c8..248324748 100644 --- a/Gemfile +++ b/Gemfile @@ -84,7 +84,7 @@ gem 'typhoeus', '0.3.3' # Views -gem 'client_side_validations', '3.2.2' +gem 'client_side_validations', '3.2.5' gem 'gon', '4.0.2' gem 'haml', '4.0.1' gem 'mobile-fu', '1.1.1' diff --git a/Gemfile.lock b/Gemfile.lock index e36829d15..c49a90f10 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -61,7 +61,7 @@ GEM childprocess (0.3.9) ffi (~> 1.0, >= 1.0.11) chunky_png (1.2.8) - client_side_validations (3.2.2) + client_side_validations (3.2.5) coderay (1.0.9) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -417,7 +417,7 @@ DEPENDENCIES bootstrap-sass (= 2.2.2.0) capybara (= 1.1.3) carrierwave (= 0.8.0) - client_side_validations (= 3.2.2) + client_side_validations (= 3.2.5) compass-rails (= 1.0.3) configurate (= 0.0.2) cucumber-rails (= 1.3.1) From ec32e33a37244ef3e21aefc7ce180c2d7d1e47e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 4 Apr 2013 21:56:41 +0200 Subject: [PATCH 09/29] bump faraday --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 248324748..fb5c5a288 100644 --- a/Gemfile +++ b/Gemfile @@ -78,7 +78,7 @@ gem 'acts-as-taggable-on', '2.3.3' # URIs and HTTP gem 'addressable', '2.3.3', :require => 'addressable/uri' -gem 'faraday', '0.8.6' +gem 'faraday', '0.8.7' gem 'faraday_middleware', '0.9.0' gem 'typhoeus', '0.3.3' diff --git a/Gemfile.lock b/Gemfile.lock index c49a90f10..31fbd0a68 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -106,7 +106,7 @@ GEM factory_girl_rails (4.2.1) factory_girl (~> 4.2.0) railties (>= 3.0.0) - faraday (0.8.6) + faraday (0.8.7) multipart-post (~> 1.1) faraday_middleware (0.9.0) faraday (>= 0.7.4, < 0.9) @@ -424,7 +424,7 @@ DEPENDENCIES database_cleaner (= 0.9.1) devise (= 2.1.3) factory_girl_rails (= 4.2.1) - faraday (= 0.8.6) + faraday (= 0.8.7) faraday_middleware (= 0.9.0) fixture_builder (= 0.3.5) fog (= 1.10.0) From 62c6ccdc566196e7f76c429fa10af243b6cb5c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 13 Apr 2013 11:38:37 +0200 Subject: [PATCH 10/29] bump rspec-mocks --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 31fbd0a68..bb227f564 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -325,7 +325,7 @@ GEM rspec-expectations (2.13.0) diff-lcs (>= 1.1.3, < 2.0) rspec-instafail (0.2.4) - rspec-mocks (2.13.0) + rspec-mocks (2.13.1) rspec-rails (2.13.0) actionpack (>= 3.0) activesupport (>= 3.0) From 07b2ceaf690a88fd3d4b596ae1ec9f0ef250af1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 13 Apr 2013 11:45:18 +0200 Subject: [PATCH 11/29] bump selenium-webdriver --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index fb5c5a288..5dea436cd 100644 --- a/Gemfile +++ b/Gemfile @@ -176,7 +176,7 @@ group :test do gem 'capybara', '1.1.3' gem 'database_cleaner', '0.9.1' - gem 'selenium-webdriver', '2.31.0' + gem 'selenium-webdriver', '2.32.1' # General helpers diff --git a/Gemfile.lock b/Gemfile.lock index bb227f564..d54889be3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -110,7 +110,7 @@ GEM multipart-post (~> 1.1) faraday_middleware (0.9.0) faraday (>= 0.7.4, < 0.9) - ffi (1.5.0) + ffi (1.7.0) fixture_builder (0.3.5) activerecord (>= 2) activesupport (>= 2) @@ -343,7 +343,7 @@ GEM railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.31.0) + selenium-webdriver (2.32.1) childprocess (>= 0.2.5) multi_json (~> 1.0) rubyzip @@ -472,7 +472,7 @@ DEPENDENCIES rspec-rails (= 2.13.0) ruby-oembed (= 0.8.8) sass-rails (= 3.2.6) - selenium-webdriver (= 2.31.0) + selenium-webdriver (= 2.32.1) sidekiq (= 2.10.0) spork (= 1.0.0rc3) timecop (= 0.6.1) From f98b8e30d6741be1e141f6376760940e2403b961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 13 Apr 2013 11:47:16 +0200 Subject: [PATCH 12/29] bump haml --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 5dea436cd..cfef25585 100644 --- a/Gemfile +++ b/Gemfile @@ -86,7 +86,7 @@ gem 'typhoeus', '0.3.3' gem 'client_side_validations', '3.2.5' gem 'gon', '4.0.2' -gem 'haml', '4.0.1' +gem 'haml', '4.0.2' gem 'mobile-fu', '1.1.1' gem 'will_paginate', '3.0.4' diff --git a/Gemfile.lock b/Gemfile.lock index d54889be3..4e672cbc0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -158,7 +158,7 @@ GEM childprocess (>= 0.2.3) guard (>= 1.1) spork (>= 0.8.4) - haml (4.0.1) + haml (4.0.2) tilt handlebars_assets (0.12.0) execjs (>= 1.2.9) @@ -375,7 +375,7 @@ GEM subexec (0.2.2) temple (0.6.3) thor (0.18.1) - tilt (1.3.6) + tilt (1.3.7) timecop (0.6.1) timers (1.1.0) treetop (1.4.12) @@ -435,7 +435,7 @@ DEPENDENCIES guard-cucumber (= 1.4.0) guard-rspec (= 2.5.3) guard-spork (= 1.5.0) - haml (= 4.0.1) + haml (= 4.0.2) handlebars_assets (= 0.12.0) http_accept_language (= 1.0.2) i18n-inflector-rails (~> 1.0) From eeba00cde471f9c0fdf0471ee6eb3667fbf111ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 13 Apr 2013 11:50:32 +0200 Subject: [PATCH 13/29] bump omniauth --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index cfef25585..2c458486b 100644 --- a/Gemfile +++ b/Gemfile @@ -65,7 +65,7 @@ gem 'ruby-oembed', '0.8.8' # Services -gem 'omniauth', '1.1.3' +gem 'omniauth', '1.1.4' gem 'omniauth-facebook', '1.4.1' gem 'omniauth-tumblr', '1.1' gem 'omniauth-twitter', '0.0.16' diff --git a/Gemfile.lock b/Gemfile.lock index 4e672cbc0..abb1e918f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -164,7 +164,7 @@ GEM execjs (>= 1.2.9) sprockets (>= 2.0.3) tilt - hashie (1.2.0) + hashie (2.0.3) hike (1.2.1) http_accept_language (1.0.2) httpauth (0.2.0) @@ -226,8 +226,8 @@ GEM jwt (~> 0.1.4) multi_json (~> 1.0) rack (~> 1.2) - omniauth (1.1.3) - hashie (~> 1.2) + omniauth (1.1.4) + hashie (>= 1.2, < 3) rack omniauth-facebook (1.4.1) omniauth-oauth2 (~> 1.1.0) @@ -448,7 +448,7 @@ DEPENDENCIES mobile-fu (= 1.1.1) mysql2 (= 0.3.11) nokogiri (= 1.5.9) - omniauth (= 1.1.3) + omniauth (= 1.1.4) omniauth-facebook (= 1.4.1) omniauth-tumblr (= 1.1) omniauth-twitter (= 0.0.16) From 0694b3e9d04a6fd0bb8a3b6515a5b1d2853765ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 13 Apr 2013 11:52:08 +0200 Subject: [PATCH 14/29] bump foreigner --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 2c458486b..3104e6a28 100644 --- a/Gemfile +++ b/Gemfile @@ -35,7 +35,7 @@ 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.4.0' +gem 'foreigner', '1.4.1' # File uploading diff --git a/Gemfile.lock b/Gemfile.lock index abb1e918f..89b0509f1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -127,7 +127,7 @@ GEM font-awesome-sass-rails (3.0.2.2) railties (>= 3.1.1) sass-rails (>= 3.1.1) - foreigner (1.4.0) + foreigner (1.4.1) activerecord (>= 3.0.0) foreman (0.62.0) thor (>= 0.13.6) @@ -428,7 +428,7 @@ DEPENDENCIES faraday_middleware (= 0.9.0) fixture_builder (= 0.3.5) fog (= 1.10.0) - foreigner (= 1.4.0) + foreigner (= 1.4.1) foreman (= 0.62) fuubar (= 1.1.0) gon (= 4.0.2) From 73aa63565c0dd403a7584cd0e1af4b517feeba3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 13 Apr 2013 12:05:49 +0200 Subject: [PATCH 15/29] bump cucumber --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 89b0509f1..21653c88e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,10 +79,10 @@ GEM configurate (0.0.2) connection_pool (1.0.0) crack (0.3.2) - cucumber (1.2.3) + cucumber (1.2.5) builder (>= 2.1.2) diff-lcs (>= 1.1.3) - gherkin (~> 2.11.6) + gherkin (~> 2.11.7) multi_json (~> 1.3) cucumber-rails (1.3.1) capybara (>= 1.1.2) @@ -137,8 +137,8 @@ GEM rspec (~> 2.0) rspec-instafail (~> 0.2.0) ruby-progressbar (~> 1.0.0) - gherkin (2.11.6) - json (>= 1.7.6) + gherkin (2.11.8) + multi_json (~> 1.3) gon (4.0.2) actionpack (>= 2.3.0) json From 734f6cadbdf52ed25e3a199a1ec8329756521083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 13 Apr 2013 12:09:57 +0200 Subject: [PATCH 16/29] bump fog --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 3104e6a28..de737b9a9 100644 --- a/Gemfile +++ b/Gemfile @@ -40,7 +40,7 @@ gem 'foreigner', '1.4.1' # File uploading gem 'carrierwave', '0.8.0' -gem 'fog', '1.10.0' +gem 'fog', '1.10.1' gem 'mini_magick', '3.5' gem 'remotipart', '1.0.5' diff --git a/Gemfile.lock b/Gemfile.lock index 21653c88e..a6d5db283 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -114,9 +114,9 @@ GEM fixture_builder (0.3.5) activerecord (>= 2) activesupport (>= 2) - fog (1.10.0) + fog (1.10.1) builder - excon (~> 0.14) + excon (~> 0.20) formatador (~> 0.2.0) mime-types multi_json (~> 1.0) @@ -217,7 +217,7 @@ GEM nested_form (0.3.1) net-scp (1.1.0) net-ssh (>= 2.6.5) - net-ssh (2.6.6) + net-ssh (2.6.7) nokogiri (1.5.9) oauth (0.4.7) oauth2 (0.8.1) @@ -427,7 +427,7 @@ DEPENDENCIES faraday (= 0.8.7) faraday_middleware (= 0.9.0) fixture_builder (= 0.3.5) - fog (= 1.10.0) + fog (= 1.10.1) foreigner (= 1.4.1) foreman (= 0.62) fuubar (= 1.1.0) From d7c68347b9b82da1b7456bec1c48d3dd95cc8b66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 13 Apr 2013 12:11:00 +0200 Subject: [PATCH 17/29] bump hike --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a6d5db283..87d2ab6fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -165,7 +165,7 @@ GEM sprockets (>= 2.0.3) tilt hashie (2.0.3) - hike (1.2.1) + hike (1.2.2) http_accept_language (1.0.2) httpauth (0.2.0) i18n (0.6.1) From e4f2c7128f25e27b8eabdb00879e65aa7c31c2ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 13 Apr 2013 12:11:53 +0200 Subject: [PATCH 18/29] bump subexec --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 87d2ab6fc..ccd1b6b2e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -372,7 +372,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - subexec (0.2.2) + subexec (0.2.3) temple (0.6.3) thor (0.18.1) tilt (1.3.7) From 83ab708d44a16c3702fd35c82b3de0267acc2e8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 13 Apr 2013 12:12:55 +0200 Subject: [PATCH 19/29] bump uglifier --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index de737b9a9..d546ffa15 100644 --- a/Gemfile +++ b/Gemfile @@ -103,7 +103,7 @@ group :assets do # Compression - gem 'uglifier', '1.3.0' + gem 'uglifier', '2.0.1' # JavaScript diff --git a/Gemfile.lock b/Gemfile.lock index ccd1b6b2e..8cd010026 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -388,7 +388,7 @@ GEM typhoeus (0.3.3) mime-types tzinfo (0.3.37) - uglifier (1.3.0) + uglifier (2.0.1) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) unicorn (4.6.2) @@ -478,7 +478,7 @@ DEPENDENCIES timecop (= 0.6.1) twitter (= 4.6.2) typhoeus (= 0.3.3) - uglifier (= 1.3.0) + uglifier (= 2.0.1) unicorn (= 4.6.2) webmock (= 1.8.11) will_paginate (= 3.0.4) From b2ae15fe6c14a1dadc16e0d01a3169dd425253cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 13 Apr 2013 12:15:01 +0200 Subject: [PATCH 20/29] bump nested_form --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8cd010026..2da82db01 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -214,7 +214,7 @@ GEM multi_json (1.7.2) multipart-post (1.2.0) mysql2 (0.3.11) - nested_form (0.3.1) + nested_form (0.3.2) net-scp (1.1.0) net-ssh (>= 2.6.5) net-ssh (2.6.7) From 347ea03042a9cc702cf63bac8c6bba86f0f03593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 15 Apr 2013 01:03:56 +0200 Subject: [PATCH 21/29] bump pg --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index d546ffa15..c3bc8f14f 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ gem 'rack-cors', '0.2.7', :require => 'rack/cors' ENV['DB'] ||= 'mysql' 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 'pg', '0.15.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres' gem 'activerecord-import', '0.3.1' gem 'foreigner', '1.4.1' From 849b0befd63e0e8bc82ba2b29ebd0406bc5bfb82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 15 Apr 2013 01:04:56 +0200 Subject: [PATCH 22/29] bump gon --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index c3bc8f14f..f75e86c8f 100644 --- a/Gemfile +++ b/Gemfile @@ -85,7 +85,7 @@ gem 'typhoeus', '0.3.3' # Views gem 'client_side_validations', '3.2.5' -gem 'gon', '4.0.2' +gem 'gon', '4.1.0' gem 'haml', '4.0.2' gem 'mobile-fu', '1.1.1' gem 'will_paginate', '3.0.4' diff --git a/Gemfile.lock b/Gemfile.lock index 2da82db01..7c0586432 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -139,7 +139,7 @@ GEM ruby-progressbar (~> 1.0.0) gherkin (2.11.8) multi_json (~> 1.3) - gon (4.0.2) + gon (4.1.0) actionpack (>= 2.3.0) json guard (1.7.0) @@ -431,7 +431,7 @@ DEPENDENCIES foreigner (= 1.4.1) foreman (= 0.62) fuubar (= 1.1.0) - gon (= 4.0.2) + gon (= 4.1.0) guard-cucumber (= 1.4.0) guard-rspec (= 2.5.3) guard-spork (= 1.5.0) From c8eec463e5ddadd468cd69b37d161bd1101a8eef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 15 Apr 2013 01:05:36 +0200 Subject: [PATCH 23/29] bump configurate --- Gemfile | 2 +- Gemfile.lock | 4 ++-- config/load_config.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index f75e86c8f..2955ee22b 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ gem 'sidekiq', '2.10.0' # Configuration -gem 'configurate', '0.0.2' +gem 'configurate', '0.0.6' # Cross-origin resource sharing diff --git a/Gemfile.lock b/Gemfile.lock index 7c0586432..80c3a5a11 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -76,7 +76,7 @@ GEM sass (~> 3.1) compass-rails (1.0.3) compass (>= 0.12.2, < 0.14) - configurate (0.0.2) + configurate (0.0.6) connection_pool (1.0.0) crack (0.3.2) cucumber (1.2.5) @@ -419,7 +419,7 @@ DEPENDENCIES carrierwave (= 0.8.0) client_side_validations (= 3.2.5) compass-rails (= 1.0.3) - configurate (= 0.0.2) + configurate (= 0.0.6) cucumber-rails (= 1.3.1) database_cleaner (= 0.9.1) devise (= 2.1.3) diff --git a/config/load_config.rb b/config/load_config.rb index 46102cd76..e9fa0d92a 100644 --- a/config/load_config.rb +++ b/config/load_config.rb @@ -40,7 +40,7 @@ AppConfig ||= Configurate::Settings.create do extend Configuration::Methods -if rails_env == "production" && + if rails_env == "production" && (environment.certificate_authorities.nil? || environment.certificate_authorities.empty? || !File.file?(environment.certificate_authorities.get)) From b3e1d860e90017ade2347f8bacabba67394f50fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 15 Apr 2013 01:08:01 +0200 Subject: [PATCH 24/29] bump rails_admin --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 2955ee22b..757348172 100644 --- a/Gemfile +++ b/Gemfile @@ -122,7 +122,7 @@ group :production do # we don't install these on travis to speed up test runs # Administration - gem 'rails_admin', '0.4.6' + gem 'rails_admin', '0.4.7' # Analytics diff --git a/Gemfile.lock b/Gemfile.lock index 80c3a5a11..12e750181 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -277,7 +277,7 @@ GEM railties (= 3.2.13) rails-i18n (0.7.3) i18n (~> 0.5) - rails_admin (0.4.6) + rails_admin (0.4.7) bootstrap-sass (~> 2.2) builder (~> 3.0) coffee-rails (~> 3.1) @@ -460,7 +460,7 @@ DEPENDENCIES rack-ssl (= 1.3.3) rails (= 3.2.13) rails-i18n (= 0.7.3) - rails_admin (= 0.4.6) + rails_admin (= 0.4.7) rails_autolink (= 1.0.9) rb-fsevent (= 0.9.3) rb-inotify (= 0.9.0) From 4bbbe93b2d2d5b749aa91a725ff989e85dd79917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 19 Apr 2013 19:07:48 +0200 Subject: [PATCH 25/29] bump acts-as-taggable-on --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 757348172..fd0949915 100644 --- a/Gemfile +++ b/Gemfile @@ -73,7 +73,7 @@ gem 'twitter', '4.6.2' # Tags -gem 'acts-as-taggable-on', '2.3.3' +gem 'acts-as-taggable-on', '2.4.0' # URIs and HTTP diff --git a/Gemfile.lock b/Gemfile.lock index 12e750181..ed94bebb6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,7 +30,7 @@ GEM activesupport (3.2.13) i18n (= 0.6.1) multi_json (~> 1.0) - acts-as-taggable-on (2.3.3) + acts-as-taggable-on (2.4.0) rails (~> 3.0) acts_as_api (0.4.1) activemodel (>= 3.0.0) @@ -410,7 +410,7 @@ PLATFORMS DEPENDENCIES activerecord-import (= 0.3.1) - acts-as-taggable-on (= 2.3.3) + acts-as-taggable-on (= 2.4.0) acts_as_api (= 0.4.1) addressable (= 2.3.3) asset_sync (= 0.5.4) From 9c582a775abdfe92b90a528f4953eac74e264398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 19 Apr 2013 19:09:16 +0200 Subject: [PATCH 26/29] bump addressable --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index fd0949915..4b02cff17 100644 --- a/Gemfile +++ b/Gemfile @@ -77,7 +77,7 @@ gem 'acts-as-taggable-on', '2.4.0' # URIs and HTTP -gem 'addressable', '2.3.3', :require => 'addressable/uri' +gem 'addressable', '2.3.4', :require => 'addressable/uri' gem 'faraday', '0.8.7' gem 'faraday_middleware', '0.9.0' gem 'typhoeus', '0.3.3' diff --git a/Gemfile.lock b/Gemfile.lock index ed94bebb6..1f809d7b3 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.3) + addressable (2.3.4) arel (3.0.2) asset_sync (0.5.4) activemodel @@ -412,7 +412,7 @@ DEPENDENCIES activerecord-import (= 0.3.1) acts-as-taggable-on (= 2.4.0) acts_as_api (= 0.4.1) - addressable (= 2.3.3) + addressable (= 2.3.4) asset_sync (= 0.5.4) bootstrap-sass (= 2.2.2.0) capybara (= 1.1.3) From cf506114c02b66c8c481c27fb70fc29f05915d39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 19 Apr 2013 19:16:00 +0200 Subject: [PATCH 27/29] bump facter --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1f809d7b3..a1f96b82a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -100,7 +100,7 @@ GEM excon (0.20.1) execjs (1.4.0) multi_json (~> 1.0) - facter (1.6.18) + facter (1.7.0) factory_girl (4.2.0) activesupport (>= 3.0.0) factory_girl_rails (4.2.1) From 38ceb93377180dd4cb6f36801a008b1c2f155497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 19 Apr 2013 19:23:11 +0200 Subject: [PATCH 28/29] bump temple --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a1f96b82a..8d3f65944 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -373,7 +373,7 @@ GEM rack (~> 1.0) tilt (~> 1.1, != 1.3.0) subexec (0.2.3) - temple (0.6.3) + temple (0.6.4) thor (0.18.1) tilt (1.3.7) timecop (0.6.1) From 6302de458d07c9ceca49b927922f2b723ddbcdbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 20 Apr 2013 10:37:22 +0200 Subject: [PATCH 29/29] bump sidekiq --- Gemfile | 4 +++- Gemfile.lock | 9 ++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 4b02cff17..943e3c299 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,9 @@ gem 'devise', '2.1.3' # Background processing -gem 'sidekiq', '2.10.0' +gem 'sidekiq', '2.10.1' +gem 'sinatra', '1.3.3' +gem 'slim', '1.3.8' # Configuration diff --git a/Gemfile.lock b/Gemfile.lock index 8d3f65944..13b68b4e6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -348,15 +348,12 @@ GEM multi_json (~> 1.0) rubyzip websocket (~> 1.0.4) - sidekiq (2.10.0) + sidekiq (2.10.1) celluloid (~> 0.12.0) connection_pool (~> 1.0) - i18n multi_json (~> 1) redis (~> 3) redis-namespace - sinatra - slim simple_oauth (0.2.0) sinatra (1.3.3) rack (~> 1.3, >= 1.3.6) @@ -473,7 +470,9 @@ DEPENDENCIES ruby-oembed (= 0.8.8) sass-rails (= 3.2.6) selenium-webdriver (= 2.32.1) - sidekiq (= 2.10.0) + sidekiq (= 2.10.1) + sinatra (= 1.3.3) + slim (= 1.3.8) spork (= 1.0.0rc3) timecop (= 0.6.1) twitter (= 4.6.2)