From 418c8d653d4bdd0cf7e72b1b3825cc0e1dcf3fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:11:57 +0200 Subject: [PATCH 01/32] bump addressable --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index b4366b551..b05749921 100644 --- a/Gemfile +++ b/Gemfile @@ -93,7 +93,7 @@ gem 'acts-as-taggable-on', '2.4.1' # URIs and HTTP -gem 'addressable', '2.3.5', :require => 'addressable/uri' +gem 'addressable', '2.3.6', :require => 'addressable/uri' gem 'faraday', '0.8.9' gem 'faraday_middleware', '0.9.0' gem 'typhoeus', '0.6.7' diff --git a/Gemfile.lock b/Gemfile.lock index 49be46e1b..d0f81a2ef 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.5) + addressable (2.3.6) arel (3.0.3) asset_sync (1.0.0) activemodel @@ -458,7 +458,7 @@ DEPENDENCIES activerecord-import (= 0.3.1) acts-as-taggable-on (= 2.4.1) acts_as_api (= 0.4.2) - addressable (= 2.3.5) + addressable (= 2.3.6) asset_sync (= 1.0.0) backbone-on-rails (= 1.1.0) bootstrap-sass (= 2.2.2.0) From f0b6f9315d55662d70116d4a62f272ba3a14555d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:15:16 +0200 Subject: [PATCH 02/32] bump backbone-on-rails --- Gemfile | 2 +- Gemfile.lock | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index b05749921..a34aeacd4 100644 --- a/Gemfile +++ b/Gemfile @@ -129,7 +129,7 @@ group :assets do # JavaScript - gem 'backbone-on-rails', '1.1.0' + gem 'backbone-on-rails', '1.1.1' gem 'handlebars_assets', '0.12.0' gem 'jquery-rails', '3.0.4' diff --git a/Gemfile.lock b/Gemfile.lock index d0f81a2ef..405bf3abb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,11 +42,15 @@ GEM activemodel fog (>= 1.8.0) atomic (1.1.14) - backbone-on-rails (1.1.0.0) + backbone-on-rails (1.1.1.0) + actionmailer + actionpack + activemodel + activeresource eco ejs jquery-rails - rails (>= 3.1) + railties bcrypt-ruby (3.1.2) bootstrap-sass (2.2.2.0) sass (~> 3.2) @@ -73,7 +77,7 @@ GEM coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.6.3) + coffee-script-source (1.7.0) compass (0.12.2) chunky_png (~> 1.2) fssm (>= 0.2.7) @@ -123,8 +127,7 @@ GEM ffi (>= 1.3.0) mime-types (~> 1.18) excon (0.31.0) - execjs (1.4.0) - multi_json (~> 1.0) + execjs (2.1.0) factory_girl (4.3.0) activesupport (>= 3.0.0) factory_girl_rails (4.3.0) @@ -239,7 +242,7 @@ GEM mobile-fu (1.2.2) rack-mobile-detect rails - multi_json (1.10.0) + multi_json (1.10.1) multi_test (0.0.3) multipart-post (1.2.0) mysql2 (0.3.14) @@ -278,7 +281,7 @@ GEM addressable nokogiri orm_adapter (0.5.0) - polyglot (0.3.4) + polyglot (0.3.5) pry (0.9.12.4) coderay (~> 1.0) method_source (~> 0.8) @@ -342,7 +345,7 @@ GEM rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) raindrops (0.12.0) - rake (10.3.1) + rake (10.3.2) rb-fsevent (0.9.4) rb-inotify (0.9.3) rdoc (3.12.2) @@ -460,7 +463,7 @@ DEPENDENCIES acts_as_api (= 0.4.2) addressable (= 2.3.6) asset_sync (= 1.0.0) - backbone-on-rails (= 1.1.0) + backbone-on-rails (= 1.1.1) bootstrap-sass (= 2.2.2.0) capybara (= 2.2.1) carrierwave (= 0.9.0) From cad043bfd70e73e59d165875784e90b43581a0de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:16:43 +0200 Subject: [PATCH 03/32] bump carrierwave --- Gemfile | 2 +- Gemfile.lock | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a34aeacd4..9966e2fa2 100644 --- a/Gemfile +++ b/Gemfile @@ -45,7 +45,7 @@ gem 'foreigner', '1.6.1' # File uploading -gem 'carrierwave', '0.9.0' +gem 'carrierwave', '0.10.0' gem 'fog', '1.19.0' gem 'mini_magick', '3.7.0' gem 'remotipart', '1.2.1' diff --git a/Gemfile.lock b/Gemfile.lock index 405bf3abb..6d50cbea7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -61,10 +61,11 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - carrierwave (0.9.0) + carrierwave (0.10.0) activemodel (>= 3.2.0) activesupport (>= 3.2.0) json (>= 1.7) + mime-types (>= 1.16) celluloid (0.15.2) timers (~> 1.1.0) childprocess (0.3.9) @@ -466,7 +467,7 @@ DEPENDENCIES backbone-on-rails (= 1.1.1) bootstrap-sass (= 2.2.2.0) capybara (= 2.2.1) - carrierwave (= 0.9.0) + carrierwave (= 0.10.0) compass-rails (= 1.0.3) configurate (= 0.0.8) cucumber-rails (= 1.4.0) From 061373d2d4473da127a12a724ad890e08fc42753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:17:59 +0200 Subject: [PATCH 04/32] bump compass-rails --- Gemfile | 2 +- Gemfile.lock | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 9966e2fa2..438b6dcb5 100644 --- a/Gemfile +++ b/Gemfile @@ -120,7 +120,7 @@ group :assets do # CSS gem 'bootstrap-sass', '2.2.2.0' - gem 'compass-rails', '1.0.3' + gem 'compass-rails', '1.1.7' gem 'sass-rails', '3.2.6' # Compression diff --git a/Gemfile.lock b/Gemfile.lock index 6d50cbea7..b497a6bf4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,7 +70,7 @@ GEM timers (~> 1.1.0) childprocess (0.3.9) ffi (~> 1.0, >= 1.0.11) - chunky_png (1.2.9) + chunky_png (1.3.1) coderay (1.1.0) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -79,12 +79,13 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) - compass (0.12.2) + compass (0.12.6) chunky_png (~> 1.2) fssm (>= 0.2.7) - sass (~> 3.1) - compass-rails (1.0.3) - compass (>= 0.12.2, < 0.14) + sass (~> 3.2.19) + compass-rails (1.1.7) + compass (>= 0.12.2) + sprockets (<= 2.11.0) configurate (0.0.8) connection_pool (1.2.0) crack (0.4.1) @@ -381,7 +382,7 @@ GEM ruby-progressbar (1.4.0) rubyzip (1.1.0) safe_yaml (0.9.7) - sass (3.2.13) + sass (3.2.19) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) @@ -468,7 +469,7 @@ DEPENDENCIES bootstrap-sass (= 2.2.2.0) capybara (= 2.2.1) carrierwave (= 0.10.0) - compass-rails (= 1.0.3) + compass-rails (= 1.1.7) configurate (= 0.0.8) cucumber-rails (= 1.4.0) database_cleaner (= 1.2.0) From 0ba9df69896f9c7ac6d8ae985c5a1e7d985fd290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:18:24 +0200 Subject: [PATCH 05/32] bump cucumber-rails --- Gemfile | 2 +- Gemfile.lock | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 438b6dcb5..94908ccac 100644 --- a/Gemfile +++ b/Gemfile @@ -210,7 +210,7 @@ group :development, :test do gem "rspec-rails", '2.14.1' # Cucumber (integration tests) - gem 'cucumber-rails', '1.4.0', :require => false + gem 'cucumber-rails', '1.4.1', :require => false # Jasmine (client side application tests (JS)) gem 'jasmine', '1.3.2' diff --git a/Gemfile.lock b/Gemfile.lock index b497a6bf4..0d0b68243 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -90,17 +90,18 @@ GEM connection_pool (1.2.0) crack (0.4.1) safe_yaml (~> 0.9.0) - cucumber (1.3.10) + cucumber (1.3.15) builder (>= 2.1.2) diff-lcs (>= 1.1.3) gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.0.2) - cucumber-rails (1.4.0) - capybara (>= 1.1.2) - cucumber (>= 1.2.0) - nokogiri (>= 1.5.0) - rails (>= 3.0.0) + multi_test (>= 0.1.1) + cucumber-rails (1.4.1) + capybara (>= 1.1.2, < 3) + cucumber (>= 1.3.8, < 2) + mime-types (~> 1.16) + nokogiri (~> 1.5) + rails (>= 3, < 5) database_cleaner (1.2.0) devise (3.2.2) bcrypt-ruby (~> 3.0) @@ -240,12 +241,12 @@ GEM mime-types (1.25.1) mini_magick (3.7.0) subexec (~> 0.2.1) - mini_portile (0.5.2) + mini_portile (0.5.3) mobile-fu (1.2.2) rack-mobile-detect rails multi_json (1.10.1) - multi_test (0.0.3) + multi_test (0.1.1) multipart-post (1.2.0) mysql2 (0.3.14) nested_form (0.3.2) @@ -471,7 +472,7 @@ DEPENDENCIES carrierwave (= 0.10.0) compass-rails (= 1.1.7) configurate (= 0.0.8) - cucumber-rails (= 1.4.0) + cucumber-rails (= 1.4.1) database_cleaner (= 1.2.0) devise (= 3.2.2) devise_lastseenable (= 0.0.4) From 9f54d404289c1fa95163f7c594b4f4898c68a1f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:19:14 +0200 Subject: [PATCH 06/32] bump database_cleaner --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 94908ccac..9e07539e0 100644 --- a/Gemfile +++ b/Gemfile @@ -194,7 +194,7 @@ group :test do # Cucumber (integration tests) gem 'capybara', '2.2.1' - gem 'database_cleaner', '1.2.0' + gem 'database_cleaner', '1.3.0' gem 'selenium-webdriver', '2.39.0' # General helpers diff --git a/Gemfile.lock b/Gemfile.lock index 0d0b68243..1bb135d4a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -102,7 +102,7 @@ GEM mime-types (~> 1.16) nokogiri (~> 1.5) rails (>= 3, < 5) - database_cleaner (1.2.0) + database_cleaner (1.3.0) devise (3.2.2) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) @@ -473,7 +473,7 @@ DEPENDENCIES compass-rails (= 1.1.7) configurate (= 0.0.8) cucumber-rails (= 1.4.1) - database_cleaner (= 1.2.0) + database_cleaner (= 1.3.0) devise (= 3.2.2) devise_lastseenable (= 0.0.4) entypo-rails From 5654d5921f3d06435da088398004f84a604c86f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:20:06 +0200 Subject: [PATCH 07/32] bump devise --- Gemfile | 2 +- Gemfile.lock | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 9e07539e0..6bd20d194 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ gem 'json', '1.8.1' # Authentication -gem 'devise', '3.2.2' +gem 'devise', '3.2.4' gem 'devise_lastseenable', '0.0.4' # Captcha diff --git a/Gemfile.lock b/Gemfile.lock index 1bb135d4a..5287a48b4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,7 +41,6 @@ GEM asset_sync (1.0.0) activemodel fog (>= 1.8.0) - atomic (1.1.14) backbone-on-rails (1.1.1.0) actionmailer actionpack @@ -51,7 +50,7 @@ GEM ejs jquery-rails railties - bcrypt-ruby (3.1.2) + bcrypt (3.1.7) bootstrap-sass (2.2.2.0) sass (~> 3.2) builder (3.0.4) @@ -103,8 +102,8 @@ GEM nokogiri (~> 1.5) rails (>= 3, < 5) database_cleaner (1.3.0) - devise (3.2.2) - bcrypt-ruby (~> 3.0) + devise (3.2.4) + bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) thread_safe (~> 0.1) @@ -421,8 +420,7 @@ GEM systemu (2.5.2) test_after_commit (0.2.2) thor (0.19.1) - thread_safe (0.1.3) - atomic + thread_safe (0.3.4) tilt (1.4.1) timecop (0.7.1) timers (1.1.0) @@ -447,6 +445,7 @@ GEM macaddr (~> 1.0) rack (>= 1.0) warden (1.2.3) + rack (>= 1.0) webmock (1.16.1) addressable (>= 2.2.7) crack (>= 0.3.2) @@ -474,7 +473,7 @@ DEPENDENCIES configurate (= 0.0.8) cucumber-rails (= 1.4.1) database_cleaner (= 1.3.0) - devise (= 3.2.2) + devise (= 3.2.4) devise_lastseenable (= 0.0.4) entypo-rails factory_girl_rails (= 4.3.0) From 85dc46b0deff41984c79b25f73b05adfd212d247 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:21:25 +0200 Subject: [PATCH 08/32] bump entypo-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 6bd20d194..b252ff245 100644 --- a/Gemfile +++ b/Gemfile @@ -115,7 +115,7 @@ gem 'zip-zip' group :assets do # Icons - gem 'entypo-rails' + gem 'entypo-rails', '2.2.1' # CSS diff --git a/Gemfile.lock b/Gemfile.lock index 5287a48b4..7215c748c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -122,7 +122,7 @@ GEM execjs eco-source (1.1.0.rc.1) ejs (1.1.1) - entypo-rails (2.0.2) + entypo-rails (2.2.1) railties (>= 3.1, <= 5) erubis (2.7.0) ethon (0.6.2) @@ -475,7 +475,7 @@ DEPENDENCIES database_cleaner (= 1.3.0) devise (= 3.2.4) devise_lastseenable (= 0.0.4) - entypo-rails + entypo-rails (= 2.2.1) factory_girl_rails (= 4.3.0) faraday (= 0.8.9) faraday_middleware (= 0.9.0) From e8999332bfd2143b82317ee38736f2d751487211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:22:08 +0200 Subject: [PATCH 09/32] bump factory_girl_rails --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index b252ff245..be28f66f2 100644 --- a/Gemfile +++ b/Gemfile @@ -199,7 +199,7 @@ group :test do # General helpers - gem 'factory_girl_rails', '4.3.0' + gem 'factory_girl_rails', '4.4.1' gem 'timecop', '0.7.1' gem 'webmock', '1.16.1', :require => false end diff --git a/Gemfile.lock b/Gemfile.lock index 7215c748c..0b77f01ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -130,10 +130,10 @@ GEM mime-types (~> 1.18) excon (0.31.0) execjs (2.1.0) - factory_girl (4.3.0) + factory_girl (4.4.0) activesupport (>= 3.0.0) - factory_girl_rails (4.3.0) - factory_girl (~> 4.3.0) + factory_girl_rails (4.4.1) + factory_girl (~> 4.4.0) railties (>= 3.0.0) faraday (0.8.9) multipart-post (~> 1.2.0) @@ -476,7 +476,7 @@ DEPENDENCIES devise (= 3.2.4) devise_lastseenable (= 0.0.4) entypo-rails (= 2.2.1) - factory_girl_rails (= 4.3.0) + factory_girl_rails (= 4.4.1) faraday (= 0.8.9) faraday_middleware (= 0.9.0) fixture_builder (= 0.3.6) From 1704d71b222eb8116a286d3e7a52281ea81e5634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:23:28 +0200 Subject: [PATCH 10/32] bump fog --- Gemfile | 2 +- Gemfile.lock | 32 ++++++++++++++++++++------------ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/Gemfile b/Gemfile index be28f66f2..dec0c7500 100644 --- a/Gemfile +++ b/Gemfile @@ -46,7 +46,7 @@ gem 'foreigner', '1.6.1' # File uploading gem 'carrierwave', '0.10.0' -gem 'fog', '1.19.0' +gem 'fog', '1.22.1' gem 'mini_magick', '3.7.0' gem 'remotipart', '1.2.1' diff --git a/Gemfile.lock b/Gemfile.lock index 0b77f01ac..b2081122a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -128,7 +128,7 @@ GEM ethon (0.6.2) ffi (>= 1.3.0) mime-types (~> 1.18) - excon (0.31.0) + excon (0.34.0) execjs (2.1.0) factory_girl (4.4.0) activesupport (>= 3.0.0) @@ -143,23 +143,31 @@ GEM fixture_builder (0.3.6) activerecord (>= 2) activesupport (>= 2) - fog (1.19.0) + fog (1.22.1) + fog-brightbox + fog-core (~> 1.22) + fog-json + ipaddress (~> 0.5) + nokogiri (~> 1.5, >= 1.5.11) + fog-brightbox (0.0.2) + fog-core + fog-json + fog-core (1.22.0) builder - excon (~> 0.31.0) - formatador (~> 0.2.0) + excon (~> 0.33) + formatador (~> 0.2) mime-types - multi_json (~> 1.0) net-scp (~> 1.1) net-ssh (>= 2.1.3) - nokogiri (~> 1.5) - ruby-hmac + fog-json (1.0.0) + multi_json (~> 1.0) font-awesome-rails (3.2.1.2) railties (>= 3.2, < 5.0) foreigner (1.6.1) activerecord (>= 3.0.0) foreman (0.62.0) thor (>= 0.13.6) - formatador (0.2.4) + formatador (0.2.5) fssm (0.2.10) fuubar (1.3.2) rspec (>= 2.14.0, < 3.1.0) @@ -203,6 +211,7 @@ GEM actionpack (>= 3.0.0) i18n-inflector (~> 2.6) railties (>= 3.0.0) + ipaddress (0.8.0) jasmine (1.3.2) jasmine-core (~> 1.3.1) rack (~> 1.0) @@ -249,9 +258,9 @@ GEM multipart-post (1.2.0) mysql2 (0.3.14) nested_form (0.3.2) - net-scp (1.1.2) + net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (2.7.0) + net-ssh (2.9.1) nokogiri (1.6.1) mini_portile (~> 0.5.0) oauth (0.4.7) @@ -377,7 +386,6 @@ GEM rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) - ruby-hmac (0.4.0) ruby-oembed (0.8.9) ruby-progressbar (1.4.0) rubyzip (1.1.0) @@ -480,7 +488,7 @@ DEPENDENCIES faraday (= 0.8.9) faraday_middleware (= 0.9.0) fixture_builder (= 0.3.6) - fog (= 1.19.0) + fog (= 1.22.1) foreigner (= 1.6.1) foreman (= 0.62) fuubar (= 1.3.2) From 7b3abb1f11d48d32fb0e791384a167176f623e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:23:54 +0200 Subject: [PATCH 11/32] bump fuubar --- Gemfile | 2 +- Gemfile.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index dec0c7500..c87bc548d 100644 --- a/Gemfile +++ b/Gemfile @@ -187,7 +187,7 @@ group :test do # RSpec (unit tests, some integration tests) gem 'fixture_builder', '0.3.6' - gem 'fuubar', '1.3.2' + gem 'fuubar', '1.3.3' gem 'rspec-instafail', '0.2.4', :require => false gem 'test_after_commit', '0.2.2' diff --git a/Gemfile.lock b/Gemfile.lock index b2081122a..d95c6ba63 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -169,9 +169,9 @@ GEM thor (>= 0.13.6) formatador (0.2.5) fssm (0.2.10) - fuubar (1.3.2) + fuubar (1.3.3) rspec (>= 2.14.0, < 3.1.0) - ruby-progressbar (~> 1.3) + ruby-progressbar (~> 1.4) galetahub-simple_captcha (0.1.5) gherkin (2.12.2) multi_json (~> 1.3) @@ -373,11 +373,11 @@ GEM rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) - rspec-core (2.14.7) - rspec-expectations (2.14.4) + rspec-core (2.14.8) + rspec-expectations (2.14.5) diff-lcs (>= 1.1.3, < 2.0) rspec-instafail (0.2.4) - rspec-mocks (2.14.4) + rspec-mocks (2.14.6) rspec-rails (2.14.1) actionpack (>= 3.0) activemodel (>= 3.0) @@ -387,7 +387,7 @@ GEM rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) ruby-oembed (0.8.9) - ruby-progressbar (1.4.0) + ruby-progressbar (1.5.1) rubyzip (1.1.0) safe_yaml (0.9.7) sass (3.2.19) @@ -491,7 +491,7 @@ DEPENDENCIES fog (= 1.22.1) foreigner (= 1.6.1) foreman (= 0.62) - fuubar (= 1.3.2) + fuubar (= 1.3.3) galetahub-simple_captcha (= 0.1.5) gon (= 4.1.1) guard-cucumber (= 1.4.1) From bb3fc500b16c88a9b9866cb34606a3c34bc564dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:24:58 +0200 Subject: [PATCH 12/32] bump gon --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index c87bc548d..5adc35413 100644 --- a/Gemfile +++ b/Gemfile @@ -100,7 +100,7 @@ gem 'typhoeus', '0.6.7' # Views -gem 'gon', '4.1.1' +gem 'gon', '5.0.4' gem 'haml', '4.0.5' gem 'mobile-fu', '1.2.2' gem 'will_paginate', '3.0.5' diff --git a/Gemfile.lock b/Gemfile.lock index d95c6ba63..54fb800d2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -175,7 +175,7 @@ GEM galetahub-simple_captcha (0.1.5) gherkin (2.12.2) multi_json (~> 1.3) - gon (4.1.1) + gon (5.0.4) actionpack (>= 2.3.0) json guard (2.2.5) @@ -493,7 +493,7 @@ DEPENDENCIES foreman (= 0.62) fuubar (= 1.3.3) galetahub-simple_captcha (= 0.1.5) - gon (= 4.1.1) + gon (= 5.0.4) guard-cucumber (= 1.4.1) guard-rspec (= 4.2.4) guard-spork (= 1.5.1) From 241c584a0d81c5ae6f4068e3b31fd4db6a81348a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:25:29 +0200 Subject: [PATCH 13/32] bump guard-rspec --- Gemfile | 2 +- Gemfile.lock | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 5adc35413..40af7cc63 100644 --- a/Gemfile +++ b/Gemfile @@ -173,7 +173,7 @@ end group :development do # Automatic test runs gem 'guard-cucumber', '1.4.1' - gem 'guard-rspec', '4.2.4' + gem 'guard-rspec', '4.2.9' gem 'rb-fsevent', '0.9.4', :require => false gem 'rb-inotify', '0.9.3', :require => false diff --git a/Gemfile.lock b/Gemfile.lock index 54fb800d2..1374aec37 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -178,16 +178,16 @@ GEM gon (5.0.4) actionpack (>= 2.3.0) json - guard (2.2.5) + guard (2.6.1) formatador (>= 0.2.4) - listen (~> 2.1) + listen (~> 2.7) lumberjack (~> 1.0) pry (>= 0.9.12) thor (>= 0.18.1) guard-cucumber (1.4.1) cucumber (>= 1.2.0) guard (>= 1.1.0) - guard-rspec (4.2.4) + guard-rspec (4.2.9) guard (~> 2.1) rspec (>= 2.14, < 4.0) guard-spork (1.5.1) @@ -232,11 +232,11 @@ GEM actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.8.1) - listen (2.4.0) + listen (2.7.5) celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - lumberjack (1.0.4) + lumberjack (1.0.6) macaddr (1.6.1) systemu (~> 2.5.0) mail (2.5.4) @@ -293,7 +293,7 @@ GEM nokogiri orm_adapter (0.5.0) polyglot (0.3.5) - pry (0.9.12.4) + pry (0.9.12.6) coderay (~> 1.0) method_source (~> 0.8) slop (~> 3.4) @@ -359,6 +359,7 @@ GEM rake (10.3.2) rb-fsevent (0.9.4) rb-inotify (0.9.3) + ffi (>= 0.5.0) rdoc (3.12.2) json (~> 1.4) redcarpet (3.1.1) @@ -413,7 +414,7 @@ GEM tilt (~> 1.3, >= 1.3.3) sinon-rails (1.7.3) railties (>= 3.1) - slop (3.4.7) + slop (3.5.0) spork (1.0.0rc4) sprockets (2.2.2) hike (~> 1.2) @@ -495,7 +496,7 @@ DEPENDENCIES galetahub-simple_captcha (= 0.1.5) gon (= 5.0.4) guard-cucumber (= 1.4.1) - guard-rspec (= 4.2.4) + guard-rspec (= 4.2.9) guard-spork (= 1.5.1) haml (= 4.0.5) handlebars_assets (= 0.12.0) From dca5a6d8f313df65af2d7b25052c02c908b9606c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:27:17 +0200 Subject: [PATCH 14/32] bump markerb --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 40af7cc63..f6bc9f81c 100644 --- a/Gemfile +++ b/Gemfile @@ -61,7 +61,7 @@ gem 'rails-i18n', '0.7.4' # Mail -gem 'markerb', '1.0.1' +gem 'markerb', '1.0.2' gem 'messagebus_ruby_api', '1.0.3' # Parsing diff --git a/Gemfile.lock b/Gemfile.lock index 1374aec37..aed45e640 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -242,7 +242,7 @@ GEM mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - markerb (1.0.1) + markerb (1.0.2) redcarpet (>= 2.0) messagebus_ruby_api (1.0.3) method_source (0.8.2) @@ -505,7 +505,7 @@ DEPENDENCIES jasmine (= 1.3.2) jquery-rails (= 3.0.4) json (= 1.8.1) - markerb (= 1.0.1) + markerb (= 1.0.2) messagebus_ruby_api (= 1.0.3) mini_magick (= 3.7.0) mobile-fu (= 1.2.2) From c25705a7e3c4dcc1d4d204f95702a5d5ef849fbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:29:53 +0200 Subject: [PATCH 15/32] bump mysql2 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index f6bc9f81c..299122d6a 100644 --- a/Gemfile +++ b/Gemfile @@ -37,7 +37,7 @@ gem 'rack-cors', '0.2.8', :require => 'rack/cors' ENV['DB'] ||= 'mysql' -gem 'mysql2', '0.3.14' if ENV['DB'] == 'all' || ENV['DB'] == 'mysql' +gem 'mysql2', '0.3.16' if ENV['DB'] == 'all' || ENV['DB'] == 'mysql' gem 'pg', '0.17.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres' gem 'activerecord-import', '0.3.1' diff --git a/Gemfile.lock b/Gemfile.lock index aed45e640..5d81ea40e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -256,7 +256,7 @@ GEM multi_json (1.10.1) multi_test (0.1.1) multipart-post (1.2.0) - mysql2 (0.3.14) + mysql2 (0.3.16) nested_form (0.3.2) net-scp (1.2.1) net-ssh (>= 2.6.5) @@ -509,7 +509,7 @@ DEPENDENCIES messagebus_ruby_api (= 1.0.3) mini_magick (= 3.7.0) mobile-fu (= 1.2.2) - mysql2 (= 0.3.14) + mysql2 (= 0.3.16) nokogiri (= 1.6.1) omniauth (= 1.1.4) omniauth-facebook (= 1.6.0) From 75107080c4beaa379510958122341f6e4645ca03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:32:31 +0200 Subject: [PATCH 16/32] bump nokogiri --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 299122d6a..be9d5fa85 100644 --- a/Gemfile +++ b/Gemfile @@ -66,7 +66,7 @@ gem 'messagebus_ruby_api', '1.0.3' # Parsing -gem 'nokogiri', '1.6.1' +gem 'nokogiri', '1.6.2.1' gem 'rails_autolink', '1.1.5' gem 'redcarpet', '3.1.1' gem 'roxml', '3.1.6' diff --git a/Gemfile.lock b/Gemfile.lock index 5d81ea40e..9f9fef22a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -249,7 +249,7 @@ GEM mime-types (1.25.1) mini_magick (3.7.0) subexec (~> 0.2.1) - mini_portile (0.5.3) + mini_portile (0.6.0) mobile-fu (1.2.2) rack-mobile-detect rails @@ -261,8 +261,8 @@ GEM net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (2.9.1) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) + nokogiri (1.6.2.1) + mini_portile (= 0.6.0) oauth (0.4.7) oauth2 (0.8.1) faraday (~> 0.8) @@ -510,7 +510,7 @@ DEPENDENCIES mini_magick (= 3.7.0) mobile-fu (= 1.2.2) mysql2 (= 0.3.16) - nokogiri (= 1.6.1) + nokogiri (= 1.6.2.1) omniauth (= 1.1.4) omniauth-facebook (= 1.6.0) omniauth-tumblr (= 1.1) From ef62fb8c8919e311802b247f22b2fd1dd191ace8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:33:55 +0200 Subject: [PATCH 17/32] bump omniauth --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index be9d5fa85..2069616a7 100644 --- a/Gemfile +++ b/Gemfile @@ -80,7 +80,7 @@ gem 'strong_parameters' # Services -gem 'omniauth', '1.1.4' +gem 'omniauth', '1.2.1' gem 'omniauth-facebook', '1.6.0' gem 'omniauth-tumblr', '1.1' gem 'omniauth-twitter', '1.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index 9f9fef22a..1a5a77754 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -200,7 +200,7 @@ GEM execjs (>= 1.2.9) sprockets (>= 2.0.3) tilt - hashie (2.0.5) + hashie (2.1.1) hike (1.2.3) http_accept_language (1.0.2) httpauth (0.2.0) @@ -270,9 +270,9 @@ GEM jwt (~> 0.1.4) multi_json (~> 1.0) rack (~> 1.2) - omniauth (1.1.4) + omniauth (1.2.1) hashie (>= 1.2, < 3) - rack + rack (~> 1.0) omniauth-facebook (1.6.0) omniauth-oauth2 (~> 1.1) omniauth-oauth (1.0.1) @@ -511,7 +511,7 @@ DEPENDENCIES mobile-fu (= 1.2.2) mysql2 (= 0.3.16) nokogiri (= 1.6.2.1) - omniauth (= 1.1.4) + omniauth (= 1.2.1) omniauth-facebook (= 1.6.0) omniauth-tumblr (= 1.1) omniauth-twitter (= 1.0.1) From b749603d1e74148799b26c8bca8d102fca16c2a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:36:03 +0200 Subject: [PATCH 18/32] bump omniauth-wordpress --- Gemfile | 2 +- Gemfile.lock | 27 ++++++++++++++------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index 2069616a7..f48ee3d4b 100644 --- a/Gemfile +++ b/Gemfile @@ -85,7 +85,7 @@ gem 'omniauth-facebook', '1.6.0' gem 'omniauth-tumblr', '1.1' gem 'omniauth-twitter', '1.0.1' gem 'twitter', '4.8.1' -gem 'omniauth-wordpress','0.2.0' +gem 'omniauth-wordpress','0.2.1' # Tags diff --git a/Gemfile.lock b/Gemfile.lock index 1a5a77754..532c8e41b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -203,7 +203,6 @@ GEM hashie (2.1.1) hike (1.2.3) http_accept_language (1.0.2) - httpauth (0.2.0) i18n (0.6.9) i18n-inflector (2.6.7) i18n (>= 0.4.1) @@ -226,8 +225,7 @@ GEM jquery-rails railties (>= 3.1.0) json (1.8.1) - jwt (0.1.10) - multi_json (>= 1.5) + jwt (1.0.0) kaminari (0.15.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -255,6 +253,7 @@ GEM rails multi_json (1.10.1) multi_test (0.1.1) + multi_xml (0.5.5) multipart-post (1.2.0) mysql2 (0.3.16) nested_form (0.3.2) @@ -264,11 +263,11 @@ GEM nokogiri (1.6.2.1) mini_portile (= 0.6.0) oauth (0.4.7) - oauth2 (0.8.1) - faraday (~> 0.8) - httpauth (~> 0.1) - jwt (~> 0.1.4) - multi_json (~> 1.0) + oauth2 (0.9.4) + faraday (>= 0.8, < 0.10) + jwt (~> 1.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) rack (~> 1.2) omniauth (1.2.1) hashie (>= 1.2, < 3) @@ -278,15 +277,17 @@ GEM omniauth-oauth (1.0.1) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.1.1) - oauth2 (~> 0.8.0) - omniauth (~> 1.0) + omniauth-oauth2 (1.1.2) + faraday (>= 0.8, < 0.10) + multi_json (~> 1.3) + oauth2 (~> 0.9.3) + omniauth (~> 1.2) omniauth-tumblr (1.1) omniauth-oauth (~> 1.0) omniauth-twitter (1.0.1) multi_json (~> 1.3) omniauth-oauth (~> 1.0) - omniauth-wordpress (0.2.0) + omniauth-wordpress (0.2.1) omniauth-oauth2 (~> 1.1.0) opengraph_parser (0.2.3) addressable @@ -515,7 +516,7 @@ DEPENDENCIES omniauth-facebook (= 1.6.0) omniauth-tumblr (= 1.1) omniauth-twitter (= 1.0.1) - omniauth-wordpress (= 0.2.0) + omniauth-wordpress (= 0.2.1) opengraph_parser (= 0.2.3) rack-cors (= 0.2.8) rack-google-analytics (= 0.14.0) From 08610f1b52fd161ede50e2858eb51deda77b4c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:36:34 +0200 Subject: [PATCH 19/32] bump rack-cors --- Gemfile | 2 +- Gemfile.lock | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index f48ee3d4b..dc525452b 100644 --- a/Gemfile +++ b/Gemfile @@ -31,7 +31,7 @@ gem 'configurate', '0.0.8' # Cross-origin resource sharing -gem 'rack-cors', '0.2.8', :require => 'rack/cors' +gem 'rack-cors', '0.2.9', :require => 'rack/cors' # Database diff --git a/Gemfile.lock b/Gemfile.lock index 532c8e41b..d43ab0559 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -301,8 +301,7 @@ GEM rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-cors (0.2.8) - rack + rack-cors (0.2.9) rack-google-analytics (0.14.0) actionpack activesupport @@ -518,7 +517,7 @@ DEPENDENCIES omniauth-twitter (= 1.0.1) omniauth-wordpress (= 0.2.1) opengraph_parser (= 0.2.3) - rack-cors (= 0.2.8) + rack-cors (= 0.2.9) rack-google-analytics (= 0.14.0) rack-piwik (= 0.2.2) rack-protection (= 1.2) From bc6ac28841f68b2bbc730ebdbdcb4018a3e8431d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:43:41 +0200 Subject: [PATCH 20/32] bump rb-inotify --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index dc525452b..142e76ac4 100644 --- a/Gemfile +++ b/Gemfile @@ -175,7 +175,7 @@ group :development do gem 'guard-cucumber', '1.4.1' gem 'guard-rspec', '4.2.9' gem 'rb-fsevent', '0.9.4', :require => false - gem 'rb-inotify', '0.9.3', :require => false + gem 'rb-inotify', '0.9.4', :require => false # Preloading environment diff --git a/Gemfile.lock b/Gemfile.lock index d43ab0559..1bddff4a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -358,7 +358,7 @@ GEM raindrops (0.12.0) rake (10.3.2) rb-fsevent (0.9.4) - rb-inotify (0.9.3) + rb-inotify (0.9.4) ffi (>= 0.5.0) rdoc (3.12.2) json (~> 1.4) @@ -529,7 +529,7 @@ DEPENDENCIES rails_admin (= 0.4.9) rails_autolink (= 1.1.5) rb-fsevent (= 0.9.4) - rb-inotify (= 0.9.3) + rb-inotify (= 0.9.4) redcarpet (= 3.1.1) remotipart (= 1.2.1) roxml (= 3.1.6) From 4aaeb5f40f4cd52fa52494522a8d14477e1d53fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:44:07 +0200 Subject: [PATCH 21/32] bump redcarpet --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 142e76ac4..2a5694fb6 100644 --- a/Gemfile +++ b/Gemfile @@ -68,7 +68,7 @@ gem 'messagebus_ruby_api', '1.0.3' gem 'nokogiri', '1.6.2.1' gem 'rails_autolink', '1.1.5' -gem 'redcarpet', '3.1.1' +gem 'redcarpet', '3.1.2' gem 'roxml', '3.1.6' gem 'ruby-oembed', '0.8.9' gem 'opengraph_parser', '0.2.3' diff --git a/Gemfile.lock b/Gemfile.lock index 1bddff4a1..8a5b2ee17 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -362,7 +362,7 @@ GEM ffi (>= 0.5.0) rdoc (3.12.2) json (~> 1.4) - redcarpet (3.1.1) + redcarpet (3.1.2) redis (3.0.6) redis-namespace (1.4.1) redis (~> 3.0.4) @@ -530,7 +530,7 @@ DEPENDENCIES rails_autolink (= 1.1.5) rb-fsevent (= 0.9.4) rb-inotify (= 0.9.4) - redcarpet (= 3.1.1) + redcarpet (= 3.1.2) remotipart (= 1.2.1) roxml (= 3.1.6) rspec-instafail (= 0.2.4) From bc9eaed3829ad0c067ef888ce137a3ca7e919474 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:44:27 +0200 Subject: [PATCH 22/32] bump rspec-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 2a5694fb6..a89e8d5bd 100644 --- a/Gemfile +++ b/Gemfile @@ -207,7 +207,7 @@ end group :development, :test do # RSpec (unit tests, some integration tests) - gem "rspec-rails", '2.14.1' + gem "rspec-rails", '2.14.2' # Cucumber (integration tests) gem 'cucumber-rails', '1.4.1', :require => false diff --git a/Gemfile.lock b/Gemfile.lock index 8a5b2ee17..10a578271 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -379,7 +379,7 @@ GEM diff-lcs (>= 1.1.3, < 2.0) rspec-instafail (0.2.4) rspec-mocks (2.14.6) - rspec-rails (2.14.1) + rspec-rails (2.14.2) actionpack (>= 3.0) activemodel (>= 3.0) activesupport (>= 3.0) @@ -534,7 +534,7 @@ DEPENDENCIES remotipart (= 1.2.1) roxml (= 3.1.6) rspec-instafail (= 0.2.4) - rspec-rails (= 2.14.1) + rspec-rails (= 2.14.2) ruby-oembed (= 0.8.9) sass-rails (= 3.2.6) selenium-webdriver (= 2.39.0) From 48a38231afc8043b5dcd532c35b6a0bc83986abf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:44:56 +0200 Subject: [PATCH 23/32] bump selenium-webdriver --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index a89e8d5bd..4ec319a97 100644 --- a/Gemfile +++ b/Gemfile @@ -195,7 +195,7 @@ group :test do gem 'capybara', '2.2.1' gem 'database_cleaner', '1.3.0' - gem 'selenium-webdriver', '2.39.0' + gem 'selenium-webdriver', '2.42.0' # General helpers diff --git a/Gemfile.lock b/Gemfile.lock index 10a578271..639dca6eb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -67,7 +67,7 @@ GEM mime-types (>= 1.16) celluloid (0.15.2) timers (~> 1.1.0) - childprocess (0.3.9) + childprocess (0.5.3) ffi (~> 1.0, >= 1.0.11) chunky_png (1.3.1) coderay (1.1.0) @@ -389,15 +389,15 @@ GEM rspec-mocks (~> 2.14.0) ruby-oembed (0.8.9) ruby-progressbar (1.5.1) - rubyzip (1.1.0) + rubyzip (1.1.4) safe_yaml (0.9.7) sass (3.2.19) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.39.0) - childprocess (>= 0.2.5) + selenium-webdriver (2.42.0) + childprocess (>= 0.5.0) multi_json (~> 1.0) rubyzip (~> 1.0) websocket (~> 1.0.4) @@ -537,7 +537,7 @@ DEPENDENCIES rspec-rails (= 2.14.2) ruby-oembed (= 0.8.9) sass-rails (= 3.2.6) - selenium-webdriver (= 2.39.0) + selenium-webdriver (= 2.42.0) sidekiq (= 2.17.2) sinatra (= 1.3.3) sinon-rails (= 1.7.3) From 91eb92180b84971ce8b96086918c52a0b571506b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:46:04 +0200 Subject: [PATCH 24/32] bump strong_parameters --- Gemfile | 2 +- Gemfile.lock | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 4ec319a97..7624c59d7 100644 --- a/Gemfile +++ b/Gemfile @@ -75,7 +75,7 @@ gem 'opengraph_parser', '0.2.3' # Please remove when migrating to Rails 4 -gem 'strong_parameters' +gem 'strong_parameters', '0.2.3' # Services diff --git a/Gemfile.lock b/Gemfile.lock index 639dca6eb..18a25c45b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -421,9 +421,10 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - strong_parameters (0.2.2) + strong_parameters (0.2.3) actionpack (~> 3.0) activemodel (~> 3.0) + activesupport (~> 3.0) railties (~> 3.0) subexec (0.2.3) systemu (2.5.2) @@ -542,7 +543,7 @@ DEPENDENCIES sinatra (= 1.3.3) sinon-rails (= 1.7.3) spork (= 1.0.0rc4) - strong_parameters + strong_parameters (= 0.2.3) test_after_commit (= 0.2.2) timecop (= 0.7.1) twitter (= 4.8.1) From 50778e5b8b6ffa6fd258658d5f44b5f65df84ee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:46:26 +0200 Subject: [PATCH 25/32] bump test_after_commit --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 7624c59d7..42550d52f 100644 --- a/Gemfile +++ b/Gemfile @@ -189,7 +189,7 @@ group :test do gem 'fixture_builder', '0.3.6' gem 'fuubar', '1.3.3' gem 'rspec-instafail', '0.2.4', :require => false - gem 'test_after_commit', '0.2.2' + gem 'test_after_commit', '0.2.3' # Cucumber (integration tests) diff --git a/Gemfile.lock b/Gemfile.lock index 18a25c45b..fe0b2bb01 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -428,7 +428,7 @@ GEM railties (~> 3.0) subexec (0.2.3) systemu (2.5.2) - test_after_commit (0.2.2) + test_after_commit (0.2.3) thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) @@ -544,7 +544,7 @@ DEPENDENCIES sinon-rails (= 1.7.3) spork (= 1.0.0rc4) strong_parameters (= 0.2.3) - test_after_commit (= 0.2.2) + test_after_commit (= 0.2.3) timecop (= 0.7.1) twitter (= 4.8.1) typhoeus (= 0.6.7) From dda4e52aacaa77fc48a9019300ffe27a5f10044e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:49:42 +0200 Subject: [PATCH 26/32] bump typhoeus --- Gemfile | 2 +- Gemfile.lock | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 42550d52f..f93f4acbd 100644 --- a/Gemfile +++ b/Gemfile @@ -96,7 +96,7 @@ gem 'acts-as-taggable-on', '2.4.1' gem 'addressable', '2.3.6', :require => 'addressable/uri' gem 'faraday', '0.8.9' gem 'faraday_middleware', '0.9.0' -gem 'typhoeus', '0.6.7' +gem 'typhoeus', '0.6.8' # Views diff --git a/Gemfile.lock b/Gemfile.lock index fe0b2bb01..a109606d5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -125,9 +125,8 @@ GEM entypo-rails (2.2.1) railties (>= 3.1, <= 5) erubis (2.7.0) - ethon (0.6.2) + ethon (0.7.0) ffi (>= 1.3.0) - mime-types (~> 1.18) excon (0.34.0) execjs (2.1.0) factory_girl (4.4.0) @@ -441,8 +440,8 @@ GEM faraday (~> 0.8, < 0.10) multi_json (~> 1.0) simple_oauth (~> 0.2) - typhoeus (0.6.7) - ethon (~> 0.6.2) + typhoeus (0.6.8) + ethon (>= 0.7.0) tzinfo (0.3.39) uglifier (2.1.2) execjs (>= 0.3.0) @@ -547,7 +546,7 @@ DEPENDENCIES test_after_commit (= 0.2.3) timecop (= 0.7.1) twitter (= 4.8.1) - typhoeus (= 0.6.7) + typhoeus (= 0.6.8) uglifier (= 2.1.2) unicorn (= 4.8.0) uuid (= 2.3.7) From 38ee2f5faf88bedab11ac969c9624508338326ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:50:03 +0200 Subject: [PATCH 27/32] bump uglifier --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index f93f4acbd..a7231e0d5 100644 --- a/Gemfile +++ b/Gemfile @@ -125,7 +125,7 @@ group :assets do # Compression - gem 'uglifier', '2.1.2' + gem 'uglifier', '2.5.0' # JavaScript diff --git a/Gemfile.lock b/Gemfile.lock index a109606d5..6a0be6072 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -443,9 +443,9 @@ GEM typhoeus (0.6.8) ethon (>= 0.7.0) tzinfo (0.3.39) - uglifier (2.1.2) + uglifier (2.5.0) execjs (>= 0.3.0) - multi_json (~> 1.0, >= 1.0.2) + json (>= 1.8.0) unicorn (4.8.0) kgio (~> 2.6) rack @@ -547,7 +547,7 @@ DEPENDENCIES timecop (= 0.7.1) twitter (= 4.8.1) typhoeus (= 0.6.8) - uglifier (= 2.1.2) + uglifier (= 2.5.0) unicorn (= 4.8.0) uuid (= 2.3.7) webmock (= 1.16.1) From 55f496cb664daaf57c79548af264fc4865a03233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:51:44 +0200 Subject: [PATCH 28/32] bump unicorn --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index a7231e0d5..d2ef0b80f 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ gem 'rails', '3.2.18' # Appserver -gem 'unicorn', '4.8.0', :require => false +gem 'unicorn', '4.8.3', :require => false # API and JSON diff --git a/Gemfile.lock b/Gemfile.lock index 6a0be6072..7e0eb4fcc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -228,7 +228,7 @@ GEM kaminari (0.15.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - kgio (2.8.1) + kgio (2.9.2) listen (2.7.5) celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) @@ -354,7 +354,7 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - raindrops (0.12.0) + raindrops (0.13.0) rake (10.3.2) rb-fsevent (0.9.4) rb-inotify (0.9.4) @@ -446,7 +446,7 @@ GEM uglifier (2.5.0) execjs (>= 0.3.0) json (>= 1.8.0) - unicorn (4.8.0) + unicorn (4.8.3) kgio (~> 2.6) rack raindrops (~> 0.7) @@ -548,7 +548,7 @@ DEPENDENCIES twitter (= 4.8.1) typhoeus (= 0.6.8) uglifier (= 2.5.0) - unicorn (= 4.8.0) + unicorn (= 4.8.3) uuid (= 2.3.7) webmock (= 1.16.1) will_paginate (= 3.0.5) From e3fd3520f2784ed9c88666ec309cf505daee8f57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:52:13 +0200 Subject: [PATCH 29/32] bump webmock --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index d2ef0b80f..ca2d3ad21 100644 --- a/Gemfile +++ b/Gemfile @@ -201,7 +201,7 @@ group :test do gem 'factory_girl_rails', '4.4.1' gem 'timecop', '0.7.1' - gem 'webmock', '1.16.1', :require => false + gem 'webmock', '1.18.0', :require => false end diff --git a/Gemfile.lock b/Gemfile.lock index 7e0eb4fcc..450ce75c4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -455,8 +455,8 @@ GEM rack (>= 1.0) warden (1.2.3) rack (>= 1.0) - webmock (1.16.1) - addressable (>= 2.2.7) + webmock (1.18.0) + addressable (>= 2.3.6) crack (>= 0.3.2) websocket (1.0.7) will_paginate (3.0.5) @@ -550,6 +550,6 @@ DEPENDENCIES uglifier (= 2.5.0) unicorn (= 4.8.3) uuid (= 2.3.7) - webmock (= 1.16.1) + webmock (= 1.18.0) will_paginate (= 3.0.5) zip-zip From 34fc681bc456ef367f422d9b07c1b852a62827f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:53:42 +0200 Subject: [PATCH 30/32] lock rails-timeago to 2.4.0 --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index ca2d3ad21..ff6dfcf2d 100644 --- a/Gemfile +++ b/Gemfile @@ -104,7 +104,7 @@ gem 'gon', '5.0.4' gem 'haml', '4.0.5' gem 'mobile-fu', '1.2.2' gem 'will_paginate', '3.0.5' -gem 'rails-timeago' +gem 'rails-timeago', '2.4.0' # Workarounds # https://github.com/rubyzip/rubyzip#important-note diff --git a/Gemfile.lock b/Gemfile.lock index 450ce75c4..e4f8b9ac9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -525,7 +525,7 @@ DEPENDENCIES rack-ssl (= 1.3.3) rails (= 3.2.18) rails-i18n (= 0.7.4) - rails-timeago + rails-timeago (= 2.4.0) rails_admin (= 0.4.9) rails_autolink (= 1.1.5) rb-fsevent (= 0.9.4) From e5f8b5fc57be9394605b51fcf012950e5e1a776b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:54:48 +0200 Subject: [PATCH 31/32] bump sinon-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index ff6dfcf2d..65bfc6fc3 100644 --- a/Gemfile +++ b/Gemfile @@ -214,5 +214,5 @@ group :development, :test do # Jasmine (client side application tests (JS)) gem 'jasmine', '1.3.2' - gem 'sinon-rails', '1.7.3' + gem 'sinon-rails', '1.9.0' end diff --git a/Gemfile.lock b/Gemfile.lock index e4f8b9ac9..f7b1facd6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -411,7 +411,7 @@ GEM rack (~> 1.3, >= 1.3.6) rack-protection (~> 1.2) tilt (~> 1.3, >= 1.3.3) - sinon-rails (1.7.3) + sinon-rails (1.9.0) railties (>= 3.1) slop (3.5.0) spork (1.0.0rc4) @@ -540,7 +540,7 @@ DEPENDENCIES selenium-webdriver (= 2.42.0) sidekiq (= 2.17.2) sinatra (= 1.3.3) - sinon-rails (= 1.7.3) + sinon-rails (= 1.9.0) spork (= 1.0.0rc4) strong_parameters (= 0.2.3) test_after_commit (= 0.2.3) From 94375cdc18bf4a76215b053fa20978b133cef399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 1 Jun 2014 13:55:07 +0200 Subject: [PATCH 32/32] bump zip-zip --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f7b1facd6..c88ddbab9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -462,7 +462,7 @@ GEM will_paginate (3.0.5) xpath (2.0.0) nokogiri (~> 1.3) - zip-zip (0.2) + zip-zip (0.3) rubyzip (>= 1.0.0) PLATFORMS