From 7bdb50ad7b0ee2dae7a3965f840ff510199208de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 10:36:37 +0200 Subject: [PATCH 01/36] bump autoprefixer-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index cbf7634b3..9b5d14ed2 100644 --- a/Gemfile +++ b/Gemfile @@ -56,7 +56,7 @@ gem "rack-cors", "0.4.0", require: "rack/cors" gem "bootstrap-sass", "2.3.2.2" gem "compass-rails", "2.0.4" gem "sass-rails", "5.0.1" -gem "autoprefixer-rails", "5.2.1.1" +gem "autoprefixer-rails", "6.0.3" # Database diff --git a/Gemfile.lock b/Gemfile.lock index e7327c381..067883a61 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,7 +57,7 @@ GEM ast (2.0.0) astrolabe (1.3.1) parser (~> 2.2) - autoprefixer-rails (5.2.1.1) + autoprefixer-rails (6.0.3) execjs json backbone-on-rails (1.2.0.0) @@ -753,7 +753,7 @@ DEPENDENCIES acts_as_api (= 0.4.2) addressable (= 2.3.8) asset_sync (= 1.1.0) - autoprefixer-rails (= 5.2.1.1) + autoprefixer-rails (= 6.0.3) backbone-on-rails (= 1.2.0.0) bootstrap-sass (= 2.3.2.2) capybara (= 2.4.4) From 8d917742e22f1df03f5be95f94c21084921fa38f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 10:37:43 +0200 Subject: [PATCH 02/36] bump capybara --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 9b5d14ed2..124e39d33 100644 --- a/Gemfile +++ b/Gemfile @@ -259,7 +259,7 @@ group :test do # Cucumber (integration tests) - gem "capybara", "2.4.4" + gem "capybara", "2.5.0" gem "database_cleaner" , "1.4.1" gem "selenium-webdriver", "2.47.1" diff --git a/Gemfile.lock b/Gemfile.lock index 067883a61..bef34ff43 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,7 +72,7 @@ GEM builder (3.2.2) byebug (4.0.5) columnize (= 0.9.0) - capybara (2.4.4) + capybara (2.5.0) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -756,7 +756,7 @@ DEPENDENCIES autoprefixer-rails (= 6.0.3) backbone-on-rails (= 1.2.0.0) bootstrap-sass (= 2.3.2.2) - capybara (= 2.4.4) + capybara (= 2.5.0) carrierwave (= 0.10.0) compass-rails (= 2.0.4) configurate (= 0.3.1) From a333b10805c0e1065f51145802352ebef461de9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 10:39:14 +0200 Subject: [PATCH 03/36] bump compass-rails --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 124e39d33..74231a9da 100644 --- a/Gemfile +++ b/Gemfile @@ -54,7 +54,7 @@ gem "rack-cors", "0.4.0", require: "rack/cors" # CSS gem "bootstrap-sass", "2.3.2.2" -gem "compass-rails", "2.0.4" +gem "compass-rails", "2.0.5" gem "sass-rails", "5.0.1" gem "autoprefixer-rails", "6.0.3" diff --git a/Gemfile.lock b/Gemfile.lock index bef34ff43..d0625f2fe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -112,9 +112,9 @@ GEM sass (>= 3.3.0, < 3.5) compass-import-once (1.0.5) sass (>= 3.2, < 3.5) - compass-rails (2.0.4) + compass-rails (2.0.5) compass (~> 1.0.0) - sass-rails (<= 5.0.1) + sass-rails (< 5.1) sprockets (< 2.13) configurate (0.3.1) connection_pool (2.2.0) @@ -638,7 +638,7 @@ GEM ruby-progressbar (1.7.5) rubyzip (1.1.7) safe_yaml (1.0.4) - sass (3.4.16) + sass (3.4.18) sass-rails (5.0.1) railties (>= 4.0.0, < 5.0) sass (~> 3.1) @@ -758,7 +758,7 @@ DEPENDENCIES bootstrap-sass (= 2.3.2.2) capybara (= 2.5.0) carrierwave (= 0.10.0) - compass-rails (= 2.0.4) + compass-rails (= 2.0.5) configurate (= 0.3.1) cucumber-rails (= 1.4.2) database_cleaner (= 1.4.1) From f996699aa2b4f0b1a73522cc06807c4fa7e779b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 10:39:50 +0200 Subject: [PATCH 04/36] bump sass-rails --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 74231a9da..b246373fa 100644 --- a/Gemfile +++ b/Gemfile @@ -55,7 +55,7 @@ gem "rack-cors", "0.4.0", require: "rack/cors" gem "bootstrap-sass", "2.3.2.2" gem "compass-rails", "2.0.5" -gem "sass-rails", "5.0.1" +gem "sass-rails", "5.0.4" gem "autoprefixer-rails", "6.0.3" # Database diff --git a/Gemfile.lock b/Gemfile.lock index d0625f2fe..121d99056 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -639,12 +639,12 @@ GEM rubyzip (1.1.7) safe_yaml (1.0.4) sass (3.4.18) - sass-rails (5.0.1) + sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) - tilt (~> 1.1) + tilt (>= 1.1, < 3) selenium-webdriver (2.47.1) childprocess (~> 0.5) multi_json (~> 1.0) @@ -851,7 +851,7 @@ DEPENDENCIES rubocop (= 0.32.1) ruby-oembed (= 0.8.14) rubyzip (= 1.1.7) - sass-rails (= 5.0.1) + sass-rails (= 5.0.4) selenium-webdriver (= 2.47.1) shoulda-matchers (= 2.8.0) sidekiq (= 3.4.2) From 16a820992b39f0e065e5cd08ca24636c153d0dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 10:40:46 +0200 Subject: [PATCH 05/36] bump database_cleaner --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index b246373fa..e091a8a80 100644 --- a/Gemfile +++ b/Gemfile @@ -260,7 +260,7 @@ group :test do # Cucumber (integration tests) gem "capybara", "2.5.0" - gem "database_cleaner" , "1.4.1" + gem "database_cleaner" , "1.5.0" gem "selenium-webdriver", "2.47.1" # General helpers diff --git a/Gemfile.lock b/Gemfile.lock index 121d99056..3e071e828 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -132,7 +132,7 @@ GEM mime-types (>= 1.16, < 3) nokogiri (~> 1.5) rails (>= 3, < 5) - database_cleaner (1.4.1) + database_cleaner (1.5.0) devise (3.5.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -761,7 +761,7 @@ DEPENDENCIES compass-rails (= 2.0.5) configurate (= 0.3.1) cucumber-rails (= 1.4.2) - database_cleaner (= 1.4.1) + database_cleaner (= 1.5.0) devise (= 3.5.1) devise-token_authenticatable (~> 0.4.0) devise_lastseenable (= 0.0.6) From 30c531a6b97ec331504a7c225c08d7eb120cff37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 10:41:15 +0200 Subject: [PATCH 06/36] bump devise --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index e091a8a80..c74c88259 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,7 @@ gem "json-schema", "2.5.1" # Authentication -gem "devise", "3.5.1" +gem "devise", "3.5.2" gem "devise_lastseenable", "0.0.6" gem "devise-token_authenticatable", "~> 0.4.0" diff --git a/Gemfile.lock b/Gemfile.lock index 3e071e828..bd7991845 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -133,7 +133,7 @@ GEM nokogiri (~> 1.5) rails (>= 3, < 5) database_cleaner (1.5.0) - devise (3.5.1) + devise (3.5.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) @@ -762,7 +762,7 @@ DEPENDENCIES configurate (= 0.3.1) cucumber-rails (= 1.4.2) database_cleaner (= 1.5.0) - devise (= 3.5.1) + devise (= 3.5.2) devise-token_authenticatable (~> 0.4.0) devise_lastseenable (= 0.0.6) diaspora-vines (~> 0.2.0.develop) From 4fa8cc4e62f1c1ba5ff9ed0fb1e8bb5c89fa6d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 10:41:50 +0200 Subject: [PATCH 07/36] bump fog --- Gemfile | 2 +- Gemfile.lock | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index c74c88259..c41866fa1 100644 --- a/Gemfile +++ b/Gemfile @@ -70,7 +70,7 @@ gem "activerecord-import", "0.10.0" # File uploading gem "carrierwave", "0.10.0" -gem "fog", "1.32.0" +gem "fog", "1.34.0" gem "mini_magick", "4.2.7" gem "remotipart", "1.2.1" diff --git a/Gemfile.lock b/Gemfile.lock index bd7991845..1eda2280c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -210,12 +210,13 @@ GEM fixture_builder (0.4.1) activerecord (>= 2) activesupport (>= 2) - fog (1.32.0) + fog (1.34.0) fog-atmos fog-aws (>= 0.6.0) fog-brightbox (~> 0.4) fog-core (~> 1.32) - fog-ecloud (= 0.1.1) + fog-dynect (~> 0.0.2) + fog-ecloud (~> 0.1) fog-google (>= 0.0.2) fog-json fog-local @@ -236,23 +237,27 @@ GEM fog-atmos (0.1.0) fog-core fog-xml - fog-aws (0.7.3) + fog-aws (0.7.6) fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-brightbox (0.8.0) + fog-brightbox (0.9.0) fog-core (~> 1.22) fog-json inflecto (~> 0.0.2) - fog-core (1.32.0) + fog-core (1.32.1) builder excon (~> 0.45) formatador (~> 0.2) mime-types net-scp (~> 1.1) net-ssh (>= 2.1.3) - fog-ecloud (0.1.1) + fog-dynect (0.0.2) + fog-core + fog-json + fog-xml + fog-ecloud (0.3.0) fog-core fog-xml fog-google (0.0.7) @@ -280,7 +285,7 @@ GEM fog-core fog-json fog-xml - fog-sakuracloud (1.0.1) + fog-sakuracloud (1.1.1) fog-core fog-json fog-serverlove (0.1.2) @@ -775,7 +780,7 @@ DEPENDENCIES faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.10.0) fixture_builder (= 0.4.1) - fog (= 1.32.0) + fog (= 1.34.0) fuubar (= 2.0.0) gon (= 6.0.1) guard (= 2.13.0) From 1db832fa118fdaf276e8e39aebcb8da341490654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 10:43:01 +0200 Subject: [PATCH 08/36] bump guard-rspec --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index c41866fa1..e076b2478 100644 --- a/Gemfile +++ b/Gemfile @@ -224,7 +224,7 @@ group :development do # Automatic test runs gem "guard-cucumber", "1.5.4" gem "guard-jshintrb", "1.1.1" - gem "guard-rspec", "4.6.3" + gem "guard-rspec", "4.6.4" gem "guard-rubocop", "1.2.0" gem "guard", "2.13.0", require: false gem "rb-fsevent", "0.9.5", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 1eda2280c..a36394de5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -341,7 +341,7 @@ GEM guard-jshintrb (1.1.1) guard (~> 2.0) jshintrb - guard-rspec (4.6.3) + guard-rspec (4.6.4) guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) @@ -786,7 +786,7 @@ DEPENDENCIES guard (= 2.13.0) guard-cucumber (= 1.5.4) guard-jshintrb (= 1.1.1) - guard-rspec (= 4.6.3) + guard-rspec (= 4.6.4) guard-rubocop (= 1.2.0) haml (= 4.0.6) handlebars_assets (= 0.20.2) From 28cebf7800252b4909ebc70e3e183bf3d74e55ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 10:43:32 +0200 Subject: [PATCH 09/36] bump haml --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index e076b2478..c476214b1 100644 --- a/Gemfile +++ b/Gemfile @@ -165,7 +165,7 @@ gem "typhoeus", "0.7.2" # Views gem "gon", "6.0.1" -gem "haml", "4.0.6" +gem "haml", "4.0.7" gem "mobile-fu", "1.3.1" gem "will_paginate", "3.0.7" gem "rails-timeago", "2.11.0" diff --git a/Gemfile.lock b/Gemfile.lock index a36394de5..3a5fb4287 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -348,7 +348,7 @@ GEM guard-rubocop (1.2.0) guard (~> 2.0) rubocop (~> 0.20) - haml (4.0.6) + haml (4.0.7) tilt handlebars_assets (0.20.2) execjs (~> 2.0) @@ -788,7 +788,7 @@ DEPENDENCIES guard-jshintrb (= 1.1.1) guard-rspec (= 4.6.4) guard-rubocop (= 1.2.0) - haml (= 4.0.6) + haml (= 4.0.7) handlebars_assets (= 0.20.2) http_accept_language (= 2.0.5) i18n-inflector-rails (= 1.0.7) From f255dc490d582d3cc900ac3ff4593f7d389d9d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 10:45:26 +0200 Subject: [PATCH 10/36] bump jquery-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index c476214b1..318e94600 100644 --- a/Gemfile +++ b/Gemfile @@ -85,7 +85,7 @@ gem "entypo-rails", "2.2.3" gem "backbone-on-rails", "1.2.0.0" gem "handlebars_assets", "0.20.2" -gem "jquery-rails", "4.0.4" +gem "jquery-rails", "4.0.5" gem "jquery-ui-rails", "5.0.5" gem "js_image_paths", "0.0.2" gem "js-routes", "1.0.1" diff --git a/Gemfile.lock b/Gemfile.lock index 3a5fb4287..d9240e365 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -382,7 +382,7 @@ GEM rake jasmine-core (2.3.4) jasmine-jquery-rails (2.0.3) - jquery-rails (4.0.4) + jquery-rails (4.0.5) rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -794,7 +794,7 @@ DEPENDENCIES i18n-inflector-rails (= 1.0.7) jasmine (= 2.2.0) jasmine-jquery-rails (= 2.0.3) - jquery-rails (= 4.0.4) + jquery-rails (= 4.0.5) jquery-ui-rails (= 5.0.5) js-routes (= 1.0.1) js_image_paths (= 0.0.2) From bab07436d26b86135813c0a459a8deb653f700d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 10:45:59 +0200 Subject: [PATCH 11/36] bump js-routes --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 318e94600..cd3158999 100644 --- a/Gemfile +++ b/Gemfile @@ -88,7 +88,7 @@ gem "handlebars_assets", "0.20.2" gem "jquery-rails", "4.0.5" gem "jquery-ui-rails", "5.0.5" gem "js_image_paths", "0.0.2" -gem "js-routes", "1.0.1" +gem "js-routes", "1.1.1" source "https://rails-assets.org" do gem "rails-assets-jquery", "1.11.2" # Should be kept in sync with jquery-rails diff --git a/Gemfile.lock b/Gemfile.lock index d9240e365..9b59277f7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -388,7 +388,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - js-routes (1.0.1) + js-routes (1.1.1) railties (>= 3.2) sprockets-rails js_image_paths (0.0.2) @@ -694,7 +694,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.3.2) + sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) @@ -796,7 +796,7 @@ DEPENDENCIES jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.0.5) jquery-ui-rails (= 5.0.5) - js-routes (= 1.0.1) + js-routes (= 1.1.1) js_image_paths (= 0.0.2) jshintrb (= 0.3.0) json (= 1.8.3) From 7f27b95d4c09f940c5537a1fb8f81edd38ba5204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 10:46:25 +0200 Subject: [PATCH 12/36] bump markerb --- Gemfile | 2 +- Gemfile.lock | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index cd3158999..5f033043d 100644 --- a/Gemfile +++ b/Gemfile @@ -121,7 +121,7 @@ gem "rails-i18n", "4.0.4" # Mail -gem "markerb", "1.0.2" +gem "markerb", "1.1.0" gem "messagebus_ruby_api", "1.0.3" # Parsing diff --git a/Gemfile.lock b/Gemfile.lock index 9b59277f7..14db4f32e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -421,8 +421,7 @@ GEM systemu (~> 2.6.2) mail (2.6.3) mime-types (>= 1.16, < 3) - markerb (1.0.2) - redcarpet (>= 2.0) + markerb (1.1.0) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) messagebus_ruby_api (1.0.3) @@ -802,7 +801,7 @@ DEPENDENCIES json (= 1.8.3) json-schema (= 2.5.1) logging-rails (= 0.5.0) - markerb (= 1.0.2) + markerb (= 1.1.0) messagebus_ruby_api (= 1.0.3) mini_magick (= 4.2.7) minitest From 21a6a8fd863b629552d4837c59db53b3d12adc9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 10:46:52 +0200 Subject: [PATCH 13/36] bump mini_magick --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 5f033043d..14894c839 100644 --- a/Gemfile +++ b/Gemfile @@ -71,7 +71,7 @@ gem "activerecord-import", "0.10.0" gem "carrierwave", "0.10.0" gem "fog", "1.34.0" -gem "mini_magick", "4.2.7" +gem "mini_magick", "4.3.3" gem "remotipart", "1.2.1" # GUID generation diff --git a/Gemfile.lock b/Gemfile.lock index 14db4f32e..d59a2ad72 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -427,7 +427,7 @@ GEM messagebus_ruby_api (1.0.3) method_source (0.8.2) mime-types (2.6.1) - mini_magick (4.2.7) + mini_magick (4.3.3) mini_portile (0.6.2) minitest (5.8.0) mobile-fu (1.3.1) @@ -803,7 +803,7 @@ DEPENDENCIES logging-rails (= 0.5.0) markerb (= 1.1.0) messagebus_ruby_api (= 1.0.3) - mini_magick (= 4.2.7) + mini_magick (= 4.3.3) minitest mobile-fu (= 1.3.1) mysql2 (= 0.3.18) From d9f9855e15a9afc331c178f28ff77eae4fca41f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 10:47:24 +0200 Subject: [PATCH 14/36] bump omniauth-twitter --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 14894c839..57985f787 100644 --- a/Gemfile +++ b/Gemfile @@ -138,7 +138,7 @@ gem "open_graph_reader", "0.6.1" gem "omniauth", "1.2.2" gem "omniauth-facebook", "2.0.1" gem "omniauth-tumblr", "1.1" -gem "omniauth-twitter", "1.2.0" +gem "omniauth-twitter", "1.2.1" gem "twitter", "5.14.0" gem "omniauth-wordpress", "0.2.2" diff --git a/Gemfile.lock b/Gemfile.lock index d59a2ad72..a4c452d7d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -470,7 +470,7 @@ GEM omniauth (~> 1.2) omniauth-tumblr (1.1) omniauth-oauth (~> 1.0) - omniauth-twitter (1.2.0) + omniauth-twitter (1.2.1) json (~> 1.3) omniauth-oauth (~> 1.1) omniauth-wordpress (0.2.2) @@ -811,7 +811,7 @@ DEPENDENCIES omniauth (= 1.2.2) omniauth-facebook (= 2.0.1) omniauth-tumblr (= 1.1) - omniauth-twitter (= 1.2.0) + omniauth-twitter (= 1.2.1) omniauth-wordpress (= 0.2.2) open_graph_reader (= 0.6.1) pry From a6eb8521c34d1a4985f1c127be187edd71ffc01c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 10:48:24 +0200 Subject: [PATCH 15/36] bump mysql2 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 57985f787..c7934b669 100644 --- a/Gemfile +++ b/Gemfile @@ -62,7 +62,7 @@ gem "autoprefixer-rails", "6.0.3" ENV["DB"] ||= "mysql" -gem "mysql2", "0.3.18" if ENV["DB"] == "all" || ENV["DB"] == "mysql" +gem "mysql2", "0.3.20" if ENV["DB"] == "all" || ENV["DB"] == "mysql" gem "pg", "0.18.2" if ENV["DB"] == "all" || ENV["DB"] == "postgres" gem "activerecord-import", "0.10.0" diff --git a/Gemfile.lock b/Gemfile.lock index a4c452d7d..cb060f47d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -437,7 +437,7 @@ GEM multi_test (0.1.2) multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.3.18) + mysql2 (0.3.20) naught (1.0.0) nenv (0.2.0) nested_form (0.3.2) @@ -806,7 +806,7 @@ DEPENDENCIES mini_magick (= 4.3.3) minitest mobile-fu (= 1.3.1) - mysql2 (= 0.3.18) + mysql2 (= 0.3.20) nokogiri (= 1.6.6.2) omniauth (= 1.2.2) omniauth-facebook (= 2.0.1) From 265ea26f05006559029314e581ce13020936ded3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 10:48:59 +0200 Subject: [PATCH 16/36] bump pg --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index c7934b669..a43b3a0b0 100644 --- a/Gemfile +++ b/Gemfile @@ -63,7 +63,7 @@ gem "autoprefixer-rails", "6.0.3" ENV["DB"] ||= "mysql" gem "mysql2", "0.3.20" if ENV["DB"] == "all" || ENV["DB"] == "mysql" -gem "pg", "0.18.2" if ENV["DB"] == "all" || ENV["DB"] == "postgres" +gem "pg", "0.18.3" if ENV["DB"] == "all" || ENV["DB"] == "postgres" gem "activerecord-import", "0.10.0" From c2a29294c93fbe4b9c95252343009099720fcc07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 10:53:22 +0200 Subject: [PATCH 17/36] bump rails-assets-highlightjs --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a43b3a0b0..97f5f99b3 100644 --- a/Gemfile +++ b/Gemfile @@ -100,7 +100,7 @@ source "https://rails-assets.org" do gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1" gem "rails-assets-markdown-it-sub", "1.0.0" gem "rails-assets-markdown-it-sup", "1.0.0" - gem "rails-assets-highlightjs", "8.6.0" + gem "rails-assets-highlightjs", "8.8.0" # jQuery plugins diff --git a/Gemfile.lock b/Gemfile.lock index cb060f47d..a7226445f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -533,7 +533,7 @@ GEM rails-assets-jquery.slimscroll (= 1.3.6) rails-assets-jquery.ui (= 1.11.4) rails-assets-favico.js (0.3.9) - rails-assets-highlightjs (8.6.0) + rails-assets-highlightjs (8.8.0) rails-assets-jakobmattsson--jquery-elastic (1.6.11) rails-assets-jquery (>= 1.2.6) rails-assets-jasmine (2.3.4) @@ -826,7 +826,7 @@ DEPENDENCIES rack-ssl (= 1.4.1) rails (= 4.2.4) rails-assets-diaspora_jsxc (~> 0.1.4.alpha, < 0.1.4.develop)! - rails-assets-highlightjs (= 8.6.0)! + rails-assets-highlightjs (= 8.8.0)! rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)! rails-assets-jasmine-ajax (= 3.2.0)! rails-assets-jeresig--jquery.hotkeys (= 0.2.0)! From 9a4b157a95a7d7200d29cb6569483c4e82a11f88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 10:54:15 +0200 Subject: [PATCH 18/36] bump rails-assets-perfect-scrollbar --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 97f5f99b3..b5cac797f 100644 --- a/Gemfile +++ b/Gemfile @@ -107,7 +107,7 @@ source "https://rails-assets.org" do gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0" gem "rails-assets-jquery-placeholder", "2.1.2" gem "rails-assets-jquery-textchange", "0.2.3" - gem "rails-assets-perfect-scrollbar", "0.6.4" + gem "rails-assets-perfect-scrollbar", "0.6.5" gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11" end diff --git a/Gemfile.lock b/Gemfile.lock index a7226445f..46f5f1206 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -558,7 +558,7 @@ GEM rails-assets-markdown-it-sanitizer (0.3.1) rails-assets-markdown-it-sub (1.0.0) rails-assets-markdown-it-sup (1.0.0) - rails-assets-perfect-scrollbar (0.6.4) + rails-assets-perfect-scrollbar (0.6.5) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.7) @@ -840,7 +840,7 @@ DEPENDENCIES rails-assets-markdown-it-sanitizer (= 0.3.1)! rails-assets-markdown-it-sub (= 1.0.0)! rails-assets-markdown-it-sup (= 1.0.0)! - rails-assets-perfect-scrollbar (= 0.6.4)! + rails-assets-perfect-scrollbar (= 0.6.5)! rails-i18n (= 4.0.4) rails-timeago (= 2.11.0) rails_admin (= 0.7.0) From f9b93c037fcd3081c89ff693d62d0222a2cf2d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 10:54:51 +0200 Subject: [PATCH 19/36] bump rails-i18n --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index b5cac797f..257cd3d85 100644 --- a/Gemfile +++ b/Gemfile @@ -117,7 +117,7 @@ gem "facebox-rails", "0.2.0" gem "http_accept_language", "2.0.5" gem "i18n-inflector-rails", "1.0.7" -gem "rails-i18n", "4.0.4" +gem "rails-i18n", "4.0.5" # Mail diff --git a/Gemfile.lock b/Gemfile.lock index 46f5f1206..9d1a45898 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -567,7 +567,7 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.2) loofah (~> 2.0) - rails-i18n (4.0.4) + rails-i18n (4.0.5) i18n (~> 0.6) railties (~> 4.0) rails-timeago (2.11.0) @@ -841,7 +841,7 @@ DEPENDENCIES rails-assets-markdown-it-sub (= 1.0.0)! rails-assets-markdown-it-sup (= 1.0.0)! rails-assets-perfect-scrollbar (= 0.6.5)! - rails-i18n (= 4.0.4) + rails-i18n (= 4.0.5) rails-timeago (= 2.11.0) rails_admin (= 0.7.0) rb-fsevent (= 0.9.5) From 16a5ac26302a719841166965233a638e1f5a8189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 10:55:16 +0200 Subject: [PATCH 20/36] bump rb-fsevent --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 257cd3d85..13dafa0f5 100644 --- a/Gemfile +++ b/Gemfile @@ -227,7 +227,7 @@ group :development do gem "guard-rspec", "4.6.4" gem "guard-rubocop", "1.2.0" gem "guard", "2.13.0", require: false - gem "rb-fsevent", "0.9.5", require: false + gem "rb-fsevent", "0.9.6", require: false gem "rb-inotify", "0.9.5", require: false # Linters diff --git a/Gemfile.lock b/Gemfile.lock index 9d1a45898..e0cc82e54 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -595,7 +595,7 @@ GEM rainbow (2.0.0) raindrops (0.15.0) rake (10.4.2) - rb-fsevent (0.9.5) + rb-fsevent (0.9.6) rb-inotify (0.9.5) ffi (>= 0.5.0) redcarpet (3.3.2) @@ -844,7 +844,7 @@ DEPENDENCIES rails-i18n (= 4.0.5) rails-timeago (= 2.11.0) rails_admin (= 0.7.0) - rb-fsevent (= 0.9.5) + rb-fsevent (= 0.9.6) rb-inotify (= 0.9.5) redcarpet (= 3.3.2) remotipart (= 1.2.1) From 92181b9882596fccf46d43aeed923491962cb629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 10:56:03 +0200 Subject: [PATCH 21/36] bump rspec-instafail --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 13dafa0f5..6d8aa4a76 100644 --- a/Gemfile +++ b/Gemfile @@ -254,7 +254,7 @@ group :test do gem "fixture_builder", "0.4.1" gem "fuubar", "2.0.0" - gem "rspec-instafail", "0.2.6", require: false + gem "rspec-instafail", "0.4.0", require: false gem "test_after_commit", "0.4.1" # Cucumber (integration tests) diff --git a/Gemfile.lock b/Gemfile.lock index e0cc82e54..a00c83c91 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -618,7 +618,7 @@ GEM rspec-expectations (3.3.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.3.0) - rspec-instafail (0.2.6) + rspec-instafail (0.4.0) rspec rspec-mocks (3.3.2) diff-lcs (>= 1.2.0, < 2.0) @@ -850,7 +850,7 @@ DEPENDENCIES remotipart (= 1.2.1) responders (= 2.1.0) roxml (= 3.1.6) - rspec-instafail (= 0.2.6) + rspec-instafail (= 0.4.0) rspec-rails (= 3.3.3) rubocop (= 0.32.1) ruby-oembed (= 0.8.14) From 9f6b4c56ad6c1d12c9cc54970cf7d40d8babf7a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 11:02:42 +0200 Subject: [PATCH 22/36] bump twitter --- Gemfile | 2 +- Gemfile.lock | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 6d8aa4a76..de37ec324 100644 --- a/Gemfile +++ b/Gemfile @@ -139,7 +139,7 @@ gem "omniauth", "1.2.2" gem "omniauth-facebook", "2.0.1" gem "omniauth-tumblr", "1.1" gem "omniauth-twitter", "1.2.1" -gem "twitter", "5.14.0" +gem "twitter", "5.15.0" gem "omniauth-wordpress", "0.2.2" # Serializers diff --git a/Gemfile.lock b/Gemfile.lock index a00c83c91..cc66a6be5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -176,7 +176,7 @@ GEM hiredis (~> 0.5.0) entypo-rails (2.2.3) railties (>= 3.1, <= 5) - equalizer (0.0.11) + equalizer (0.0.10) erubis (2.7.0) ethon (0.7.4) ffi (>= 1.3.0) @@ -359,10 +359,14 @@ GEM hike (1.2.3) hiredis (0.5.2) hitimes (1.2.2) - http (0.6.4) + http (0.9.6) + addressable (~> 2.3) + http-cookie (~> 1.0) + http-form_data (~> 1.0.1) http_parser.rb (~> 0.6.0) http-cookie (1.0.2) domain_name (~> 0.5) + http-form_data (1.0.1) http_accept_language (2.0.5) http_parser.rb (0.6.0) i18n (0.7.0) @@ -707,12 +711,12 @@ GEM timecop (0.8.0) timers (4.0.1) hitimes - twitter (5.14.0) + twitter (5.15.0) addressable (~> 2.3) buftok (~> 0.2.0) - equalizer (~> 0.0.9) + equalizer (= 0.0.10) faraday (~> 0.9.0) - http (~> 0.6.0) + http (>= 0.4, < 0.10) http_parser.rb (~> 0.6.0) json (~> 1.8) memoizable (~> 0.4.0) @@ -869,7 +873,7 @@ DEPENDENCIES spring-commands-rspec (= 1.0.4) test_after_commit (= 0.4.1) timecop (= 0.8.0) - twitter (= 5.14.0) + twitter (= 5.15.0) twitter-text (= 1.12.0) typhoeus (= 0.7.2) uglifier (= 2.7.2) From 6ea200e0e3b50ca4848f9a3e77886bf33c6fda04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 11:03:07 +0200 Subject: [PATCH 23/36] bump twitter-text --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index de37ec324..87e0adbef 100644 --- a/Gemfile +++ b/Gemfile @@ -128,7 +128,7 @@ gem "messagebus_ruby_api", "1.0.3" gem "nokogiri", "1.6.6.2" gem "redcarpet", "3.3.2" -gem "twitter-text", "1.12.0" +gem "twitter-text", "1.13.0" gem "roxml", "3.1.6" gem "ruby-oembed", "0.8.14" gem "open_graph_reader", "0.6.1" diff --git a/Gemfile.lock b/Gemfile.lock index cc66a6be5..3dcd76623 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -722,7 +722,7 @@ GEM memoizable (~> 0.4.0) naught (~> 1.0) simple_oauth (~> 0.3.0) - twitter-text (1.12.0) + twitter-text (1.13.0) unf (~> 0.1.0) typhoeus (0.7.2) ethon (>= 0.7.4) @@ -874,7 +874,7 @@ DEPENDENCIES test_after_commit (= 0.4.1) timecop (= 0.8.0) twitter (= 5.15.0) - twitter-text (= 1.12.0) + twitter-text (= 1.13.0) typhoeus (= 0.7.2) uglifier (= 2.7.2) unicorn (= 4.9.0) From 78655b6f4343094a8542e6ad3bd3096092a039e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 11:03:32 +0200 Subject: [PATCH 24/36] bump typhoeus --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 87e0adbef..ca0f70767 100644 --- a/Gemfile +++ b/Gemfile @@ -160,7 +160,7 @@ gem "addressable", "2.3.8", require: "addressable/uri" gem "faraday", "0.9.1" gem "faraday_middleware", "0.10.0" gem "faraday-cookie_jar", "0.0.6" -gem "typhoeus", "0.7.2" +gem "typhoeus", "0.7.3" # Views diff --git a/Gemfile.lock b/Gemfile.lock index 3dcd76623..a0deec7e6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -178,7 +178,7 @@ GEM railties (>= 3.1, <= 5) equalizer (0.0.10) erubis (2.7.0) - ethon (0.7.4) + ethon (0.8.0) ffi (>= 1.3.0) eventmachine (1.0.8) excon (0.45.4) @@ -724,7 +724,7 @@ GEM simple_oauth (~> 0.3.0) twitter-text (1.13.0) unf (~> 0.1.0) - typhoeus (0.7.2) + typhoeus (0.7.3) ethon (>= 0.7.4) tzinfo (1.2.2) thread_safe (~> 0.1) @@ -875,7 +875,7 @@ DEPENDENCIES timecop (= 0.8.0) twitter (= 5.15.0) twitter-text (= 1.13.0) - typhoeus (= 0.7.2) + typhoeus (= 0.7.3) uglifier (= 2.7.2) unicorn (= 4.9.0) uuid (= 2.3.8) From f27a729b54e1de9045f6eeaef76a6aa3c74092c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 11:07:24 +0200 Subject: [PATCH 25/36] bump kgio --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a0deec7e6..d35c08843 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -408,7 +408,7 @@ GEM kaminari (0.16.3) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - kgio (2.9.3) + kgio (2.10.0) listen (3.0.3) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) From 00429bac95854bb49ff91f67b585b865cb0e03d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 11:07:49 +0200 Subject: [PATCH 26/36] bump little-plugger --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d35c08843..9c11d4fbc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -412,7 +412,7 @@ GEM listen (3.0.3) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - little-plugger (1.1.3) + little-plugger (1.1.4) logging (2.0.0) little-plugger (~> 1.1) multi_json (~> 1.10) From 21c54d108388d5d546171337aee327a1c7662020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 11:08:14 +0200 Subject: [PATCH 27/36] bump timers --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9c11d4fbc..6f60b6d5e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -709,7 +709,7 @@ GEM thread_safe (0.3.5) tilt (1.4.1) timecop (0.8.0) - timers (4.0.1) + timers (4.0.4) hitimes twitter (5.15.0) addressable (~> 2.3) From 4fec2e89685ede861ec6fb22392dfc1f32c289a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 7 Sep 2015 11:08:35 +0200 Subject: [PATCH 28/36] bump valid --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6f60b6d5e..7134112af 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -740,7 +740,7 @@ GEM raindrops (~> 0.7) uuid (2.3.8) macaddr (~> 1.0) - valid (1.0.0) + valid (1.0.2) warden (1.2.3) rack (>= 1.0) webmock (1.21.0) From de9f7d417328c85eea0c24d17bdf95ec4b724568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 13 Sep 2015 02:11:38 +0200 Subject: [PATCH 29/36] bump spring --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index ca0f70767..88372140d 100644 --- a/Gemfile +++ b/Gemfile @@ -236,7 +236,7 @@ group :development do # Preloading environment - gem "spring", "1.3.6" + gem "spring", "1.4.0" gem "spring-commands-rspec", "1.0.4" gem "spring-commands-cucumber", "1.0.1" diff --git a/Gemfile.lock b/Gemfile.lock index 7134112af..03eea9556 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -687,7 +687,7 @@ GEM sinon-rails (1.15.0) railties (>= 3.1) slop (3.6.0) - spring (1.3.6) + spring (1.4.0) spring-commands-cucumber (1.0.1) spring (>= 0.9.1) spring-commands-rspec (1.0.4) @@ -868,7 +868,7 @@ DEPENDENCIES simplecov (= 0.10.0) sinatra (= 1.4.6) sinon-rails (= 1.15.0) - spring (= 1.3.6) + spring (= 1.4.0) spring-commands-cucumber (= 1.0.1) spring-commands-rspec (= 1.0.4) test_after_commit (= 0.4.1) From ab74d2313d3d89583c4c223df023e33c9fdd723c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 13 Sep 2015 02:13:32 +0200 Subject: [PATCH 30/36] bump naught --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 03eea9556..6cbdfa754 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -442,7 +442,7 @@ GEM multi_xml (0.5.5) multipart-post (2.0.0) mysql2 (0.3.20) - naught (1.0.0) + naught (1.1.0) nenv (0.2.0) nested_form (0.3.2) net-scp (1.2.1) From 0169f5ca8c7efa5d25195ee5ac637594d3994bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Mon, 14 Sep 2015 17:14:58 +0200 Subject: [PATCH 31/36] bump eye, sidekiq, celluloid --- Gemfile | 4 +-- Gemfile.lock | 76 +++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 63 insertions(+), 17 deletions(-) diff --git a/Gemfile b/Gemfile index 88372140d..a421abf39 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ gem "simple_captcha2", "0.3.4", require: "simple_captcha" # Background processing -gem "sidekiq", "3.4.2" +gem "sidekiq", "3.5.0" gem "sinatra", "1.4.6" # Scheduled processing @@ -208,7 +208,7 @@ group :production do # we don"t install these on travis to speed up test runs # Process management - gem "eye", "0.7.pre" + gem "eye", "0.8.pre" # Redirects diff --git a/Gemfile.lock b/Gemfile.lock index 6cbdfa754..79d0bd126 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -83,11 +83,55 @@ GEM activesupport (>= 3.2.0) json (>= 1.7) mime-types (>= 1.16) - celluloid (0.16.0) - timers (~> 4.0.0) - celluloid-io (0.16.2) - celluloid (>= 0.16.0) - nio4r (>= 1.1.0) + celluloid (0.17.1.2) + bundler + celluloid-essentials + celluloid-extras + celluloid-fsm + celluloid-pool + celluloid-supervision + dotenv + nenv + rspec-logsplit (>= 0.1.2) + timers (>= 4.1.1) + celluloid-essentials (0.20.2.1) + bundler + dotenv + nenv + rspec-logsplit (>= 0.1.2) + timers (>= 4.1.1) + celluloid-extras (0.20.1) + bundler + dotenv + nenv + rspec-logsplit (>= 0.1.2) + timers (>= 4.1.1) + celluloid-fsm (0.20.1) + bundler + dotenv + nenv + rspec-logsplit (>= 0.1.2) + timers (>= 4.1.1) + celluloid-io (0.17.1) + bundler + celluloid (>= 0.17.1.1) + dotenv + nenv + nio4r (>= 1.1) + rspec-logsplit (>= 0.1.2) + timers (>= 4.1.1) + celluloid-pool (0.20.1) + bundler + dotenv + nenv + rspec-logsplit (>= 0.1.2) + timers (>= 4.1.1) + celluloid-supervision (0.20.1.1) + bundler + dotenv + nenv + rspec-logsplit (>= 0.1.2) + timers (>= 4.1.1) childprocess (0.5.6) ffi (~> 1.0, >= 1.0.11) chunky_png (1.3.4) @@ -165,6 +209,7 @@ GEM docile (1.1.5) domain_name (0.5.24) unf (>= 0.0.5, < 1.0.0) + dotenv (2.0.2) eco (1.0.0) coffee-script eco-source @@ -183,10 +228,10 @@ GEM eventmachine (1.0.8) excon (0.45.4) execjs (2.6.0) - eye (0.7.pre) - celluloid (~> 0.16.0) - celluloid-io (~> 0.16.0) - sigar (~> 0.7.2) + eye (0.8.pre) + celluloid (~> 0.17.0) + celluloid-io (~> 0.17.0) + sigar (~> 0.7.3) state_machine thor facebox-rails (0.2.0) @@ -358,7 +403,7 @@ GEM hashie (3.4.2) hike (1.2.3) hiredis (0.5.2) - hitimes (1.2.2) + hitimes (1.2.3) http (0.9.6) addressable (~> 2.3) http-cookie (~> 1.0) @@ -624,6 +669,7 @@ GEM rspec-support (~> 3.3.0) rspec-instafail (0.4.0) rspec + rspec-logsplit (0.1.3) rspec-mocks (3.3.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.3.0) @@ -661,8 +707,8 @@ GEM shellany (0.0.1) shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - sidekiq (3.4.2) - celluloid (~> 0.16.0) + sidekiq (3.5.0) + celluloid (~> 0.17.0) connection_pool (~> 2.2, >= 2.2.0) json (~> 1.0) redis (~> 3.2, >= 3.2.1) @@ -709,7 +755,7 @@ GEM thread_safe (0.3.5) tilt (1.4.1) timecop (0.8.0) - timers (4.0.4) + timers (4.1.1) hitimes twitter (5.15.0) addressable (~> 2.3) @@ -776,7 +822,7 @@ DEPENDENCIES diaspora-vines (~> 0.2.0.develop) diaspora_federation-rails (= 0.0.7) entypo-rails (= 2.2.3) - eye (= 0.7.pre) + eye (= 0.8.pre) facebox-rails (= 0.2.0) factory_girl_rails (= 4.5.0) faraday (= 0.9.1) @@ -862,7 +908,7 @@ DEPENDENCIES sass-rails (= 5.0.4) selenium-webdriver (= 2.47.1) shoulda-matchers (= 2.8.0) - sidekiq (= 3.4.2) + sidekiq (= 3.5.0) sidetiq (= 0.6.3) simple_captcha2 (= 0.3.4) simplecov (= 0.10.0) From 691274d068f70b66b43447899e99ceb1bb01d216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 19 Sep 2015 18:16:05 +0200 Subject: [PATCH 32/36] bump jasmine --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index a421abf39..1d7d65693 100644 --- a/Gemfile +++ b/Gemfile @@ -279,7 +279,7 @@ group :development, :test do gem "cucumber-rails", "1.4.2", require: false # Jasmine (client side application tests (JS)) - gem "jasmine", "2.2.0" + gem "jasmine", "2.3.1" gem "jasmine-jquery-rails", "2.0.3" gem "rails-assets-jasmine-ajax", "3.2.0", source: "https://rails-assets.org" gem "sinon-rails", "1.15.0" diff --git a/Gemfile.lock b/Gemfile.lock index 79d0bd126..ae1d1b799 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -424,8 +424,8 @@ GEM ice_cube (0.11.1) inflecto (0.0.2) ipaddress (0.8.0) - jasmine (2.2.0) - jasmine-core (~> 2.2) + jasmine (2.3.1) + jasmine-core (~> 2.3) phantomjs rack (>= 1.2.1) rake @@ -841,7 +841,7 @@ DEPENDENCIES handlebars_assets (= 0.20.2) http_accept_language (= 2.0.5) i18n-inflector-rails (= 1.0.7) - jasmine (= 2.2.0) + jasmine (= 2.3.1) jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.0.5) jquery-ui-rails (= 5.0.5) From cce910000f4fad90de496d8a6567d54858ce41a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 19 Sep 2015 18:19:40 +0200 Subject: [PATCH 33/36] bump js-routes --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 1d7d65693..b541e8910 100644 --- a/Gemfile +++ b/Gemfile @@ -88,7 +88,7 @@ gem "handlebars_assets", "0.20.2" gem "jquery-rails", "4.0.5" gem "jquery-ui-rails", "5.0.5" gem "js_image_paths", "0.0.2" -gem "js-routes", "1.1.1" +gem "js-routes", "1.1.2" source "https://rails-assets.org" do gem "rails-assets-jquery", "1.11.2" # Should be kept in sync with jquery-rails diff --git a/Gemfile.lock b/Gemfile.lock index ae1d1b799..0a0027bf9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -437,7 +437,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - js-routes (1.1.1) + js-routes (1.1.2) railties (>= 3.2) sprockets-rails js_image_paths (0.0.2) @@ -845,7 +845,7 @@ DEPENDENCIES jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.0.5) jquery-ui-rails (= 5.0.5) - js-routes (= 1.1.1) + js-routes (= 1.1.2) js_image_paths (= 0.0.2) jshintrb (= 0.3.0) json (= 1.8.3) From cacc3c2994d79f1aadafdf3124d12b678208949a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 19 Sep 2015 18:30:41 +0200 Subject: [PATCH 34/36] bump mime-types --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0a0027bf9..e4d31b607 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -475,7 +475,7 @@ GEM thread_safe (~> 0.3, >= 0.3.1) messagebus_ruby_api (1.0.3) method_source (0.8.2) - mime-types (2.6.1) + mime-types (2.6.2) mini_magick (4.3.3) mini_portile (0.6.2) minitest (5.8.0) From e571acf2f25bb525f091a572f592cd46224db42f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 19 Sep 2015 18:31:37 +0200 Subject: [PATCH 35/36] bump notiffany --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e4d31b607..b6f08c63a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -496,7 +496,7 @@ GEM nio4r (1.1.1) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) - notiffany (0.0.7) + notiffany (0.0.8) nenv (~> 0.1) shellany (~> 0.0) oauth (0.4.7) From 8c246c406f6a15475d957461ae3e50cb03f3da90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 19 Sep 2015 21:07:31 +0200 Subject: [PATCH 36/36] bump typhoeus --- Gemfile | 4 ++-- Gemfile.lock | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index b541e8910..bec3c220d 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem "unicorn", "4.9.0", require: false # Federation -gem "diaspora_federation-rails", "0.0.7" +gem "diaspora_federation-rails", "0.0.8" # API and JSON @@ -160,7 +160,7 @@ gem "addressable", "2.3.8", require: "addressable/uri" gem "faraday", "0.9.1" gem "faraday_middleware", "0.10.0" gem "faraday-cookie_jar", "0.0.6" -gem "typhoeus", "0.7.3" +gem "typhoeus", "0.8.0" # Views diff --git a/Gemfile.lock b/Gemfile.lock index b6f08c63a..ee8c0f6ec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -196,14 +196,14 @@ GEM eventmachine (>= 1.0.5, < 1.1) http_parser.rb (~> 0.6) nokogiri (~> 1.6) - diaspora_federation (0.0.7) + diaspora_federation (0.0.8) faraday (~> 0.9.0) faraday_middleware (~> 0.10.0) nokogiri (~> 1.6, >= 1.6.6) - typhoeus (~> 0.7.0) + typhoeus (~> 0.7) valid (~> 1.0) - diaspora_federation-rails (0.0.7) - diaspora_federation (= 0.0.7) + diaspora_federation-rails (0.0.8) + diaspora_federation (= 0.0.8) rails (~> 4.2) diff-lcs (1.2.5) docile (1.1.5) @@ -770,8 +770,8 @@ GEM simple_oauth (~> 0.3.0) twitter-text (1.13.0) unf (~> 0.1.0) - typhoeus (0.7.3) - ethon (>= 0.7.4) + typhoeus (0.8.0) + ethon (>= 0.8.0) tzinfo (1.2.2) thread_safe (~> 0.1) uglifier (2.7.2) @@ -820,7 +820,7 @@ DEPENDENCIES devise-token_authenticatable (~> 0.4.0) devise_lastseenable (= 0.0.6) diaspora-vines (~> 0.2.0.develop) - diaspora_federation-rails (= 0.0.7) + diaspora_federation-rails (= 0.0.8) entypo-rails (= 2.2.3) eye (= 0.8.pre) facebox-rails (= 0.2.0) @@ -921,7 +921,7 @@ DEPENDENCIES timecop (= 0.8.0) twitter (= 5.15.0) twitter-text (= 1.13.0) - typhoeus (= 0.7.3) + typhoeus (= 0.8.0) uglifier (= 2.7.2) unicorn (= 4.9.0) uuid (= 2.3.8)