From 126062d7215222b0d62bc0466baa7694f15ac744 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Fri, 21 Jul 2017 02:35:52 +0200 Subject: [PATCH 01/58] Bump rails --- Gemfile | 2 +- Gemfile.lock | 74 ++++++++++++++++++++++++++-------------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Gemfile b/Gemfile index 414b0138d..425cbf7e0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "rails", "4.2.8" +gem "rails", "4.2.9" # Legacy Rails features, remove me! # responders (class level) diff --git a/Gemfile.lock b/Gemfile.lock index 84f8172e4..aacb00e8c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,40 +2,40 @@ GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - actionmailer (4.2.8) - actionpack (= 4.2.8) - actionview (= 4.2.8) - activejob (= 4.2.8) + actionmailer (4.2.9) + actionpack (= 4.2.9) + actionview (= 4.2.9) + activejob (= 4.2.9) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.8) - actionview (= 4.2.8) - activesupport (= 4.2.8) + actionpack (4.2.9) + actionview (= 4.2.9) + activesupport (= 4.2.9) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.8) - activesupport (= 4.2.8) + actionview (4.2.9) + activesupport (= 4.2.9) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) active_model_serializers (0.9.5) activemodel (>= 3.2) - activejob (4.2.8) - activesupport (= 4.2.8) + activejob (4.2.9) + activesupport (= 4.2.9) globalid (>= 0.3.0) - activemodel (4.2.8) - activesupport (= 4.2.8) + activemodel (4.2.9) + activesupport (= 4.2.9) builder (~> 3.1) - activerecord (4.2.8) - activemodel (= 4.2.8) - activesupport (= 4.2.8) + activerecord (4.2.9) + activemodel (= 4.2.9) + activesupport (= 4.2.9) arel (~> 6.0) activerecord-import (0.17.1) activerecord (>= 3.2) - activesupport (4.2.8) + activesupport (4.2.9) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -239,8 +239,8 @@ GEM gitlab (4.0.0) httparty terminal-table (= 1.7.1) - globalid (0.3.7) - activesupport (>= 4.1.0) + globalid (0.4.0) + activesupport (>= 4.2.0) gon (6.1.0) actionpack (>= 3.0) json @@ -301,7 +301,7 @@ GEM httparty (0.14.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (0.8.1) + i18n (0.8.6) i18n-inflector (2.6.7) i18n (>= 0.4.1) i18n-inflector-rails (1.0.7) @@ -356,7 +356,7 @@ GEM lumberjack (1.0.11) macaddr (1.7.1) systemu (~> 2.6.2) - mail (2.6.4) + mail (2.6.6) mime-types (>= 1.16, < 4) markerb (1.1.0) memoizable (0.4.2) @@ -368,7 +368,7 @@ GEM mimemagic (0.3.2) mini_magick (4.6.1) mini_portile2 (2.1.0) - minitest (5.10.1) + minitest (5.10.2) mobile-fu (1.3.1) rack-mobile-detect rails @@ -466,7 +466,7 @@ GEM public_suffix (2.0.5) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) - rack (1.6.5) + rack (1.6.8) rack-cors (0.4.1) rack-google-analytics (1.2.0) actionpack @@ -487,16 +487,16 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.8) - actionmailer (= 4.2.8) - actionpack (= 4.2.8) - actionview (= 4.2.8) - activejob (= 4.2.8) - activemodel (= 4.2.8) - activerecord (= 4.2.8) - activesupport (= 4.2.8) + rails (4.2.9) + actionmailer (= 4.2.9) + actionpack (= 4.2.9) + actionview (= 4.2.9) + activejob (= 4.2.9) + activemodel (= 4.2.9) + activerecord (= 4.2.9) + activesupport (= 4.2.9) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.8) + railties (= 4.2.9) sprockets-rails rails-assets-autosize (3.0.20) rails-assets-backbone (1.3.3) @@ -558,9 +558,9 @@ GEM rails-timeago (2.16.0) actionpack (>= 3.1) activesupport (>= 3.1) - railties (4.2.8) - actionpack (= 4.2.8) - activesupport (= 4.2.8) + railties (4.2.9) + actionpack (= 4.2.9) + activesupport (= 4.2.9) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.2.2) @@ -837,7 +837,7 @@ DEPENDENCIES rack-piwik (= 0.3.0) rack-rewrite (= 1.5.1) rack-ssl (= 1.4.1) - rails (= 4.2.8) + rails (= 4.2.9) rails-assets-autosize (= 3.0.20)! rails-assets-backbone (= 1.3.3)! rails-assets-blueimp-gallery (= 2.25.0)! @@ -897,4 +897,4 @@ DEPENDENCIES will_paginate (= 3.1.5) BUNDLED WITH - 1.14.6 + 1.15.3 From 99474d8cfaacf9db1846521b2da604b29dfe437d Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Fri, 21 Jul 2017 02:43:18 +0200 Subject: [PATCH 02/58] Bump unicorn --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 425cbf7e0..f69bacff6 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem "responders", "2.3.0" # Appserver -gem "unicorn", "5.2.0", require: false +gem "unicorn", "5.3.0", require: false gem "unicorn-worker-killer", "0.4.4" # Federation diff --git a/Gemfile.lock b/Gemfile.lock index aacb00e8c..2c2375d3f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -565,7 +565,7 @@ GEM thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake - raindrops (0.17.0) + raindrops (0.18.0) rake (12.0.0) rb-fsevent (0.9.8) rb-inotify (0.9.8) @@ -715,7 +715,7 @@ GEM unf_ext unf_ext (0.0.7.2) unicode-display_width (1.1.3) - unicorn (5.2.0) + unicorn (5.3.0) kgio (~> 2.6) raindrops (~> 0.7) unicorn-worker-killer (0.4.4) @@ -889,7 +889,7 @@ DEPENDENCIES twitter-text (= 1.14.5) typhoeus (= 1.1.2) uglifier (= 3.1.2) - unicorn (= 5.2.0) + unicorn (= 5.3.0) unicorn-worker-killer (= 0.4.4) uuid (= 2.3.8) versionist (= 1.5.0) From d9b34898463126dd11c62258a8cf0155e3808aa1 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Fri, 21 Jul 2017 02:46:06 +0200 Subject: [PATCH 03/58] Bump responders --- Gemfile | 2 +- Gemfile.lock | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index f69bacff6..d1eb8d08f 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ gem "rails", "4.2.9" # Legacy Rails features, remove me! # responders (class level) -gem "responders", "2.3.0" +gem "responders", "2.4.0" # Appserver diff --git a/Gemfile.lock b/Gemfile.lock index 2c2375d3f..ddc7ffddd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -575,8 +575,9 @@ GEM redis-namespace (1.5.3) redis (~> 3.0, >= 3.0.4) request_store (1.3.2) - responders (2.3.0) - railties (>= 4.2.0, < 5.1) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) rspec (3.5.0) rspec-core (~> 3.5.0) rspec-expectations (~> 3.5.0) @@ -864,7 +865,7 @@ DEPENDENCIES rb-fsevent (= 0.9.8) rb-inotify (= 0.9.8) redcarpet (= 3.4.0) - responders (= 2.3.0) + responders (= 2.4.0) rspec-rails (= 3.5.2) rubocop (= 0.48.1) ruby-oembed (= 0.10.1) From 14712df69c6f2a8ff4b687c2bf88bee176b7f6f9 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Fri, 21 Jul 2017 02:48:07 +0200 Subject: [PATCH 04/58] Bump json --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index d1eb8d08f..3a3bc76de 100644 --- a/Gemfile +++ b/Gemfile @@ -18,7 +18,7 @@ gem "diaspora_federation-rails", "0.2.0" # API and JSON gem "acts_as_api", "1.0.0" -gem "json", "1.8.6" +gem "json", "2.1.0" gem "json-schema", "2.8.0" # Authentication diff --git a/Gemfile.lock b/Gemfile.lock index ddc7ffddd..07c7ae61f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -327,7 +327,7 @@ GEM sprockets-rails js_image_paths (0.1.0) rails (~> 4.0) - json (1.8.6) + json (2.1.0) json-jwt (1.7.1) activesupport bindata @@ -806,7 +806,7 @@ DEPENDENCIES jquery-ui-rails (= 5.0.5) js-routes (= 1.3.3) js_image_paths (= 0.1.0) - json (= 1.8.6) + json (= 2.1.0) json-schema (= 2.8.0) leaflet-rails (= 0.7.7) logging-rails (= 0.5.0) From 816fa558621ee376195341acdfdb78c1889a827d Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Fri, 21 Jul 2017 03:10:36 +0200 Subject: [PATCH 05/58] Bump devise --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 3a3bc76de..30a2053b5 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ gem "json-schema", "2.8.0" # Authentication -gem "devise", "4.2.0" +gem "devise", "4.3.0" gem "devise_lastseenable", "0.0.6" # Captcha diff --git a/Gemfile.lock b/Gemfile.lock index 07c7ae61f..31b727537 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -153,10 +153,10 @@ GEM railties (>= 3, < 5.1) cucumber-wire (0.0.1) database_cleaner (1.5.3) - devise (4.2.0) + devise (4.3.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.1) + railties (>= 4.1.0, < 5.2) responders warden (~> 1.2.3) devise_lastseenable (0.0.6) @@ -776,7 +776,7 @@ DEPENDENCIES cucumber-api-steps (= 0.13) cucumber-rails (= 1.4.5) database_cleaner (= 1.5.3) - devise (= 4.2.0) + devise (= 4.3.0) devise_lastseenable (= 0.0.6) diaspora-prosody-config (= 0.0.7) diaspora_federation-rails (= 0.2.0) From a89ad996174782193a550a3f9f419ad8b33bd794 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Fri, 21 Jul 2017 03:14:38 +0200 Subject: [PATCH 06/58] Bump sidekiq --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 30a2053b5..115d71101 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ gem "simple_captcha2", "0.4.3", require: "simple_captcha" # Background processing -gem "sidekiq", "4.2.9" +gem "sidekiq", "4.2.10" # Scheduled processing diff --git a/Gemfile.lock b/Gemfile.lock index 31b727537..33c4ba39c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -480,7 +480,7 @@ GEM multi_json (>= 1.3.6) rack (>= 1.1) rack-piwik (0.3.0) - rack-protection (1.5.3) + rack-protection (2.0.0) rack rack-rewrite (1.5.1) rack-ssl (1.4.1) @@ -632,7 +632,7 @@ GEM shellany (0.0.1) shoulda-matchers (3.1.1) activesupport (>= 4.0.0) - sidekiq (4.2.9) + sidekiq (4.2.10) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) @@ -873,7 +873,7 @@ DEPENDENCIES sass-rails (= 5.0.6) secure_headers (= 3.6.1) shoulda-matchers (= 3.1.1) - sidekiq (= 4.2.9) + sidekiq (= 4.2.10) sidekiq-cron (= 0.4.5) simple_captcha2 (= 0.4.3) simplecov (= 0.12.0) From 512739916ef0c7d77c632b780789d47862708acc Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Fri, 21 Jul 2017 03:20:42 +0200 Subject: [PATCH 07/58] Bump sidekiq-cron --- Gemfile | 2 +- Gemfile.lock | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 115d71101..f56486cad 100644 --- a/Gemfile +++ b/Gemfile @@ -36,7 +36,7 @@ gem "sidekiq", "4.2.10" # Scheduled processing -gem "sidekiq-cron", "0.4.5" +gem "sidekiq-cron", "0.6.3" # Compression diff --git a/Gemfile.lock b/Gemfile.lock index 33c4ba39c..5967ae47e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -188,6 +188,8 @@ GEM execjs multi_json (>= 1.3) rake + et-orbi (1.0.5) + tzinfo ethon (0.10.1) ffi (>= 1.3.0) excon (0.55.0) @@ -572,8 +574,6 @@ GEM ffi (>= 0.5.0) redcarpet (3.4.0) redis (3.3.3) - redis-namespace (1.5.3) - redis (~> 3.0, >= 3.0.4) request_store (1.3.2) responders (2.4.0) actionpack (>= 4.2.0, < 5.3) @@ -609,8 +609,8 @@ GEM ruby-progressbar (1.8.1) ruby_dep (1.5.0) rubyzip (1.2.1) - rufus-scheduler (3.3.4) - tzinfo + rufus-scheduler (3.4.2) + et-orbi (~> 1.0) rugged (0.25.1.1) safe_yaml (1.0.4) sass (3.4.23) @@ -637,9 +637,8 @@ GEM connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) redis (~> 3.2, >= 3.2.1) - sidekiq-cron (0.4.5) - redis-namespace (>= 1.5.2) - rufus-scheduler (>= 2.0.24) + sidekiq-cron (0.6.3) + rufus-scheduler (>= 3.3.0) sidekiq (>= 4.2.1) sigar (0.7.3) simple_captcha2 (0.4.3) @@ -874,7 +873,7 @@ DEPENDENCIES secure_headers (= 3.6.1) shoulda-matchers (= 3.1.1) sidekiq (= 4.2.10) - sidekiq-cron (= 0.4.5) + sidekiq-cron (= 0.6.3) simple_captcha2 (= 0.4.3) simplecov (= 0.12.0) sinon-rails (= 1.15.0) From ae8dd05f4f9fdd439976ec26fe3c67778f13bc41 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Fri, 21 Jul 2017 03:22:05 +0200 Subject: [PATCH 08/58] Bump uglifier --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index f56486cad..8ebcba0de 100644 --- a/Gemfile +++ b/Gemfile @@ -40,7 +40,7 @@ gem "sidekiq-cron", "0.6.3" # Compression -gem "uglifier", "3.1.2" +gem "uglifier", "3.2.0" # Configuration diff --git a/Gemfile.lock b/Gemfile.lock index 5967ae47e..5b4d0c3a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -709,7 +709,7 @@ GEM ethon (>= 0.9.0) tzinfo (1.2.3) thread_safe (~> 0.1) - uglifier (3.1.2) + uglifier (3.2.0) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext @@ -888,7 +888,7 @@ DEPENDENCIES twitter (= 6.1.0) twitter-text (= 1.14.5) typhoeus (= 1.1.2) - uglifier (= 3.1.2) + uglifier (= 3.2.0) unicorn (= 5.3.0) unicorn-worker-killer (= 0.4.4) uuid (= 2.3.8) From c6be849998654dd73c36292da59cfd2df6be335c Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Fri, 21 Jul 2017 03:25:02 +0200 Subject: [PATCH 09/58] Bump rack-cors --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 8ebcba0de..978b12919 100644 --- a/Gemfile +++ b/Gemfile @@ -48,7 +48,7 @@ gem "configurate", "0.3.1" # Cross-origin resource sharing -gem "rack-cors", "0.4.1", require: "rack/cors" +gem "rack-cors", "1.0.1", require: "rack/cors" # CSS diff --git a/Gemfile.lock b/Gemfile.lock index 5b4d0c3a1..471f4f217 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -469,7 +469,7 @@ GEM quiet_assets (1.1.0) railties (>= 3.1, < 5.0) rack (1.6.8) - rack-cors (0.4.1) + rack-cors (1.0.1) rack-google-analytics (1.2.0) actionpack activesupport @@ -832,7 +832,7 @@ DEPENDENCIES pry pry-byebug quiet_assets (= 1.1.0) - rack-cors (= 0.4.1) + rack-cors (= 1.0.1) rack-google-analytics (= 1.2.0) rack-piwik (= 0.3.0) rack-rewrite (= 1.5.1) From d33ac50060c1e328ccc983f39f3eb1adb465d727 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Fri, 21 Jul 2017 03:31:06 +0200 Subject: [PATCH 10/58] Bump autoprefixer-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 978b12919..1fad77984 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ gem "rack-cors", "1.0.1", require: "rack/cors" # CSS -gem "autoprefixer-rails", "6.7.6" +gem "autoprefixer-rails", "7.1.2.3" gem "bootstrap-sass", "3.3.7" gem "bootstrap-switch-rails", "3.3.3" gem "compass-rails", "2.0.5" diff --git a/Gemfile.lock b/Gemfile.lock index 471f4f217..587855ac0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,7 +56,7 @@ GEM unf ast (2.3.0) attr_required (1.0.1) - autoprefixer-rails (6.7.6) + autoprefixer-rails (7.1.2.3) execjs bcrypt (3.1.11) bindata (2.3.5) @@ -764,7 +764,7 @@ DEPENDENCIES acts_as_api (= 1.0.0) addressable (= 2.5.0) asset_sync (= 2.0.0) - autoprefixer-rails (= 6.7.6) + autoprefixer-rails (= 7.1.2.3) bootstrap-sass (= 3.3.7) bootstrap-switch-rails (= 3.3.3) capybara (= 2.12.1) From 6d9cfa961ff78b222406995832d5bad1599800ec Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Fri, 21 Jul 2017 03:41:11 +0200 Subject: [PATCH 11/58] Bump compass-rails Add sprockets as fixed dependency, we don't want to upgrade this by accident --- Gemfile | 3 ++- Gemfile.lock | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 1fad77984..51398af77 100644 --- a/Gemfile +++ b/Gemfile @@ -55,8 +55,9 @@ gem "rack-cors", "1.0.1", require: "rack/cors" gem "autoprefixer-rails", "7.1.2.3" gem "bootstrap-sass", "3.3.7" gem "bootstrap-switch-rails", "3.3.3" -gem "compass-rails", "2.0.5" +gem "compass-rails", "3.0.2" gem "sass-rails", "5.0.6" +gem "sprockets", "2.12.4" # Database diff --git a/Gemfile.lock b/Gemfile.lock index 587855ac0..ea7df1ea1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -116,10 +116,10 @@ GEM sass (>= 3.3.0, < 3.5) compass-import-once (1.0.5) sass (>= 3.2, < 3.5) - compass-rails (2.0.5) + compass-rails (3.0.2) compass (~> 1.0.0) sass-rails (< 5.1) - sprockets (< 2.13) + sprockets (< 4.0) concurrent-ruby (1.0.5) configurate (0.3.1) connection_pool (2.2.1) @@ -613,7 +613,7 @@ GEM et-orbi (~> 1.0) rugged (0.25.1.1) safe_yaml (1.0.4) - sass (3.4.23) + sass (3.4.25) sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) @@ -769,7 +769,7 @@ DEPENDENCIES bootstrap-switch-rails (= 3.3.3) capybara (= 2.12.1) carrierwave (= 0.11.2) - compass-rails (= 2.0.5) + compass-rails (= 3.0.2) configurate (= 0.3.1) coveralls cucumber-api-steps (= 0.13) @@ -880,6 +880,7 @@ DEPENDENCIES spring (= 2.0.1) spring-commands-cucumber (= 1.0.1) spring-commands-rspec (= 1.0.4) + sprockets (= 2.12.4) string-direction (= 1.2.0) test_after_commit (= 1.1.0) thor (= 0.19.1) From 4074660a867bf5d0f0470ce3fdda29f36de75ba4 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Fri, 21 Jul 2017 03:46:41 +0200 Subject: [PATCH 12/58] Bump mysql2 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 51398af77..fb2f7985f 100644 --- a/Gemfile +++ b/Gemfile @@ -62,7 +62,7 @@ gem "sprockets", "2.12.4" # Database group :mysql, optional: true do - gem "mysql2", "0.4.5" + gem "mysql2", "0.4.8" end group :postgresql, optional: true do gem "pg", "0.19.0" diff --git a/Gemfile.lock b/Gemfile.lock index ea7df1ea1..5ce65ea69 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -378,7 +378,7 @@ GEM multi_test (0.1.2) multi_xml (0.6.0) multipart-post (2.0.0) - mysql2 (0.4.5) + mysql2 (0.4.8) naught (1.1.0) nenv (0.3.0) nio4r (2.0.0) @@ -813,7 +813,7 @@ DEPENDENCIES mini_magick (= 4.6.1) minitest mobile-fu (= 1.3.1) - mysql2 (= 0.4.5) + mysql2 (= 0.4.8) nokogiri (= 1.7.2) omniauth (= 1.4.2) omniauth-facebook (= 4.0.0) From 21c2864b39edd293973c94ce9295cea68e82d509 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Fri, 21 Jul 2017 03:51:08 +0200 Subject: [PATCH 13/58] Bump pg --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index fb2f7985f..048b17cb9 100644 --- a/Gemfile +++ b/Gemfile @@ -65,7 +65,7 @@ group :mysql, optional: true do gem "mysql2", "0.4.8" end group :postgresql, optional: true do - gem "pg", "0.19.0" + gem "pg", "0.21.0" end diff --git a/Gemfile.lock b/Gemfile.lock index 5ce65ea69..47457715e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -432,7 +432,7 @@ GEM orm_adapter (0.5.0) parser (2.4.0.0) ast (~> 2.2) - pg (0.19.0) + pg (0.21.0) phantomjs (2.1.1.0) poltergeist (1.13.0) capybara (~> 2.1) @@ -822,7 +822,7 @@ DEPENDENCIES omniauth-wordpress (= 0.2.2) open_graph_reader (= 0.6.2) openid_connect (= 0.12.0) - pg (= 0.19.0) + pg (= 0.21.0) poltergeist (= 1.13.0) pronto (= 0.9.3) pronto-eslint (= 0.9.1) From f0c3ae3782a4c6e398743e223a2faca0c8ca1ce1 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Fri, 21 Jul 2017 03:56:09 +0200 Subject: [PATCH 14/58] Bump activerecord-import --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 048b17cb9..0e0f18ffd 100644 --- a/Gemfile +++ b/Gemfile @@ -69,7 +69,7 @@ group :postgresql, optional: true do end -gem "activerecord-import", "0.17.1" +gem "activerecord-import", "0.19.1" # File uploading diff --git a/Gemfile.lock b/Gemfile.lock index 47457715e..a08965454 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -33,7 +33,7 @@ GEM activemodel (= 4.2.9) activesupport (= 4.2.9) arel (~> 6.0) - activerecord-import (0.17.1) + activerecord-import (0.19.1) activerecord (>= 3.2) activesupport (4.2.9) i18n (~> 0.7) @@ -759,7 +759,7 @@ PLATFORMS DEPENDENCIES active_model_serializers (= 0.9.5) - activerecord-import (= 0.17.1) + activerecord-import (= 0.19.1) acts-as-taggable-on (= 3.5.0) acts_as_api (= 1.0.0) addressable (= 2.5.0) From 17b51beeda0c66e9e6815517df75de69c0fdf663 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Fri, 21 Jul 2017 04:09:50 +0200 Subject: [PATCH 15/58] Bump fog-aws --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 0e0f18ffd..f44c0c74b 100644 --- a/Gemfile +++ b/Gemfile @@ -73,7 +73,7 @@ gem "activerecord-import", "0.19.1" # File uploading -gem "fog-aws", "1.2.1" +gem "fog-aws", "1.4.0" gem "carrierwave", "0.11.2" gem "mini_magick", "4.6.1" diff --git a/Gemfile.lock b/Gemfile.lock index a08965454..90d9cdb58 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -192,7 +192,7 @@ GEM tzinfo ethon (0.10.1) ffi (>= 1.3.0) - excon (0.55.0) + excon (0.57.1) execjs (2.7.0) eye (0.9.1) celluloid (~> 0.17.3) @@ -217,21 +217,21 @@ GEM fixture_builder (0.4.1) activerecord (>= 2) activesupport (>= 2) - fog-aws (1.2.1) + fog-aws (1.4.0) fog-core (~> 1.38) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (1.43.0) + fog-core (1.44.3) builder excon (~> 0.49) formatador (~> 0.2) fog-json (1.0.2) fog-core (~> 1.0) multi_json (~> 1.10) - fog-xml (0.1.2) + fog-xml (0.1.3) fog-core - nokogiri (~> 1.5, >= 1.5.11) + nokogiri (>= 1.5.11, < 2.0.0) formatador (0.2.5) fuubar (2.2.0) rspec-core (~> 3.0) @@ -787,7 +787,7 @@ DEPENDENCIES faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.11.0.1) fixture_builder (= 0.4.1) - fog-aws (= 1.2.1) + fog-aws (= 1.4.0) fuubar (= 2.2.0) gon (= 6.1.0) guard (= 2.14.1) From 31e85f32ac27309f03da8f742e53079f584ad3f9 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Fri, 21 Jul 2017 04:11:32 +0200 Subject: [PATCH 16/58] Bump carrierwave --- Gemfile | 2 +- Gemfile.lock | 11 ++++------- app/uploaders/exported_user.rb | 6 ++---- app/uploaders/processed_image.rb | 4 ++-- app/uploaders/unprocessed_image.rb | 8 ++++---- spec/models/photo_spec.rb | 2 +- 6 files changed, 14 insertions(+), 19 deletions(-) diff --git a/Gemfile b/Gemfile index f44c0c74b..8786e75cb 100644 --- a/Gemfile +++ b/Gemfile @@ -73,8 +73,8 @@ gem "activerecord-import", "0.19.1" # File uploading +gem "carrierwave", "1.1.0" gem "fog-aws", "1.4.0" -gem "carrierwave", "0.11.2" gem "mini_magick", "4.6.1" # GUID generation diff --git a/Gemfile.lock b/Gemfile.lock index 90d9cdb58..1fb8a19a5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,12 +74,10 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - carrierwave (0.11.2) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - json (>= 1.7) + carrierwave (1.1.0) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) mime-types (>= 1.16) - mimemagic (>= 0.3.0) celluloid (0.17.3) celluloid-essentials celluloid-extras @@ -367,7 +365,6 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mimemagic (0.3.2) mini_magick (4.6.1) mini_portile2 (2.1.0) minitest (5.10.2) @@ -768,7 +765,7 @@ DEPENDENCIES bootstrap-sass (= 3.3.7) bootstrap-switch-rails (= 3.3.3) capybara (= 2.12.1) - carrierwave (= 0.11.2) + carrierwave (= 1.1.0) compass-rails (= 3.0.2) configurate (= 0.3.1) coveralls diff --git a/app/uploaders/exported_user.rb b/app/uploaders/exported_user.rb index a7c4d5a2b..f2d309c2b 100644 --- a/app/uploaders/exported_user.rb +++ b/app/uploaders/exported_user.rb @@ -3,17 +3,15 @@ # the COPYRIGHT file. class ExportedUser < SecureUploader - def store_dir "uploads/users" end - def extension_white_list - %w(gz) + def extension_whitelist + %w[gz] end def filename "#{model.username}_diaspora_data_#{secure_token}.json.gz" end - end diff --git a/app/uploaders/processed_image.rb b/app/uploaders/processed_image.rb index 68b540cf9..226d4fd47 100644 --- a/app/uploaders/processed_image.rb +++ b/app/uploaders/processed_image.rb @@ -9,8 +9,8 @@ class ProcessedImage < CarrierWave::Uploader::Base "uploads/images" end - def extension_white_list - %w(jpg jpeg png gif tiff) + def extension_whitelist + %w[jpg jpeg png gif tiff] end def filename diff --git a/app/uploaders/unprocessed_image.rb b/app/uploaders/unprocessed_image.rb index 86d425eb2..10186dd9b 100644 --- a/app/uploaders/unprocessed_image.rb +++ b/app/uploaders/unprocessed_image.rb @@ -6,7 +6,7 @@ class UnprocessedImage < CarrierWave::Uploader::Base include CarrierWave::MiniMagick attr_accessor :strip_exif - + def strip_exif @strip_exif || false end @@ -15,8 +15,8 @@ class UnprocessedImage < CarrierWave::Uploader::Base "uploads/images" end - def extension_white_list - %w(jpg jpeg png gif) + def extension_whitelist + %w[jpg jpeg png gif] end def filename @@ -38,7 +38,7 @@ class UnprocessedImage < CarrierWave::Uploader::Base version :thumb_medium version :thumb_large version :scaled_full do - process :get_version_dimensions + process :get_version_dimensions end def get_version_dimensions diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb index 470f95a58..31d4afff6 100644 --- a/spec/models/photo_spec.rb +++ b/spec/models/photo_spec.rb @@ -178,7 +178,7 @@ describe Photo, :type => :model do file = File.open(@fail_fixture_name) expect { @photo.unprocessed_image.store! file - }.to raise_error CarrierWave::IntegrityError, 'You are not allowed to upload "xml" files, allowed types: jpg, jpeg, png, gif' + }.to raise_error CarrierWave::IntegrityError end end From 047f333e882bd97ff0be05c6d3a3ad47d002495e Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Fri, 21 Jul 2017 04:13:52 +0200 Subject: [PATCH 17/58] Bump mini_magick --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 8786e75cb..811ea67c4 100644 --- a/Gemfile +++ b/Gemfile @@ -75,7 +75,7 @@ gem "activerecord-import", "0.19.1" gem "carrierwave", "1.1.0" gem "fog-aws", "1.4.0" -gem "mini_magick", "4.6.1" +gem "mini_magick", "4.8.0" # GUID generation gem "uuid", "2.3.8" diff --git a/Gemfile.lock b/Gemfile.lock index 1fb8a19a5..ab8466678 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -365,7 +365,7 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mini_magick (4.6.1) + mini_magick (4.8.0) mini_portile2 (2.1.0) minitest (5.10.2) mobile-fu (1.3.1) @@ -807,7 +807,7 @@ DEPENDENCIES leaflet-rails (= 0.7.7) logging-rails (= 0.5.0) markerb (= 1.1.0) - mini_magick (= 4.6.1) + mini_magick (= 4.8.0) minitest mobile-fu (= 1.3.1) mysql2 (= 0.4.8) From 91ea6448fab3390cb4e6f9bc15d7b6cde7deb231 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 00:58:55 +0200 Subject: [PATCH 18/58] Bump handlebars_assets --- Gemfile | 2 +- Gemfile.lock | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 811ea67c4..6339caea1 100644 --- a/Gemfile +++ b/Gemfile @@ -86,7 +86,7 @@ gem "entypo-rails", "3.0.0" # JavaScript -gem "handlebars_assets", "0.23.1" +gem "handlebars_assets", "0.23.2" gem "jquery-rails", "4.2.2" gem "jquery-ui-rails", "5.0.5" gem "js-routes", "1.3.3" diff --git a/Gemfile.lock b/Gemfile.lock index ab8466678..223d74097 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -279,9 +279,8 @@ GEM temple (>= 0.8.0) thor tilt - handlebars_assets (0.23.1) + handlebars_assets (0.23.2) execjs (~> 2.0) - multi_json (~> 1.0) sprockets (>= 2.0.0) tilt (>= 1.2) hashdiff (0.3.2) @@ -793,7 +792,7 @@ DEPENDENCIES guard-rubocop (= 1.2.0) haml_lint (= 0.24.0) hamlit (= 2.8.0) - handlebars_assets (= 0.23.1) + handlebars_assets (= 0.23.2) http_accept_language (= 2.1.0) i18n-inflector-rails (= 1.0.7) jasmine (= 2.5.2) From e2072ded2c2c8ff2f1b5a909facf709da9319f09 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 01:07:39 +0200 Subject: [PATCH 19/58] Bump jquery --- Gemfile | 4 ++-- Gemfile.lock | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 6339caea1..e27c4b077 100644 --- a/Gemfile +++ b/Gemfile @@ -87,13 +87,13 @@ gem "entypo-rails", "3.0.0" # JavaScript gem "handlebars_assets", "0.23.2" -gem "jquery-rails", "4.2.2" +gem "jquery-rails", "4.3.1" gem "jquery-ui-rails", "5.0.5" gem "js-routes", "1.3.3" gem "js_image_paths", "0.1.0" source "https://rails-assets.org" do - gem "rails-assets-jquery", "3.1.1" # Should be kept in sync with jquery-rails + gem "rails-assets-jquery", "3.2.1" # Should be kept in sync with jquery-rails gem "rails-assets-highlightjs", "9.9.0" gem "rails-assets-markdown-it", "8.3.0" diff --git a/Gemfile.lock b/Gemfile.lock index 223d74097..53b2c677a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -315,7 +315,7 @@ GEM rake jasmine-core (2.5.2) jasmine-jquery-rails (2.0.3) - jquery-rails (4.2.2) + jquery-rails (4.3.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -366,7 +366,7 @@ GEM mime-types-data (3.2016.0521) mini_magick (4.8.0) mini_portile2 (2.1.0) - minitest (5.10.2) + minitest (5.10.3) mobile-fu (1.3.1) rack-mobile-detect rails @@ -520,7 +520,7 @@ GEM rails-assets-jasmine (2.5.2) rails-assets-jasmine-ajax (3.3.1) rails-assets-jasmine (~> 2) - rails-assets-jquery (3.1.1) + rails-assets-jquery (3.2.1) rails-assets-jquery-colorbox (1.6.4) rails-assets-jquery (>= 1.3.2) rails-assets-jquery-fullscreen-plugin (0.5.0) @@ -797,7 +797,7 @@ DEPENDENCIES i18n-inflector-rails (= 1.0.7) jasmine (= 2.5.2) jasmine-jquery-rails (= 2.0.3) - jquery-rails (= 4.2.2) + jquery-rails (= 4.3.1) jquery-ui-rails (= 5.0.5) js-routes (= 1.3.3) js_image_paths (= 0.1.0) @@ -843,7 +843,7 @@ DEPENDENCIES rails-assets-fine-uploader (= 5.13.0)! rails-assets-highlightjs (= 9.9.0)! rails-assets-jasmine-ajax (= 3.3.1)! - rails-assets-jquery (= 3.1.1)! + rails-assets-jquery (= 3.2.1)! rails-assets-jquery-placeholder (= 2.3.1)! rails-assets-jquery-textchange (= 0.2.3)! rails-assets-jquery.are-you-sure (= 1.9.0)! From b43d9ce1867f863d11d8160a09cc9ba8afdb1b93 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 01:13:49 +0200 Subject: [PATCH 20/58] Bump http_accept_language --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index e27c4b077..3a946bdd2 100644 --- a/Gemfile +++ b/Gemfile @@ -121,7 +121,7 @@ end # Localization -gem "http_accept_language", "2.1.0" +gem "http_accept_language", "2.1.1" gem "i18n-inflector-rails", "1.0.7" gem "rails-i18n", "4.0.8" diff --git a/Gemfile.lock b/Gemfile.lock index 53b2c677a..6d0cc3c9d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -295,7 +295,7 @@ GEM http-cookie (1.0.3) domain_name (~> 0.5) http-form_data (1.0.1) - http_accept_language (2.1.0) + http_accept_language (2.1.1) http_parser.rb (0.6.0) httparty (0.14.0) multi_xml (>= 0.5.2) @@ -793,7 +793,7 @@ DEPENDENCIES haml_lint (= 0.24.0) hamlit (= 2.8.0) handlebars_assets (= 0.23.2) - http_accept_language (= 2.1.0) + http_accept_language (= 2.1.1) i18n-inflector-rails (= 1.0.7) jasmine (= 2.5.2) jasmine-jquery-rails (= 2.0.3) From bde25ff6e47ba6eacfcf98392849b2fc87522a56 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 01:16:21 +0200 Subject: [PATCH 21/58] Bump rails-i18n --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 3a946bdd2..d589f2927 100644 --- a/Gemfile +++ b/Gemfile @@ -123,7 +123,7 @@ end gem "http_accept_language", "2.1.1" gem "i18n-inflector-rails", "1.0.7" -gem "rails-i18n", "4.0.8" +gem "rails-i18n", "4.0.9" # Mail diff --git a/Gemfile.lock b/Gemfile.lock index 6d0cc3c9d..362193746 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -550,7 +550,7 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - rails-i18n (4.0.8) + rails-i18n (4.0.9) i18n (~> 0.7) railties (~> 4.0) rails-timeago (2.16.0) @@ -855,7 +855,7 @@ DEPENDENCIES rails-assets-markdown-it-sub (= 1.0.0)! rails-assets-markdown-it-sup (= 1.0.0)! rails-assets-perfect-scrollbar (= 0.6.16)! - rails-i18n (= 4.0.8) + rails-i18n (= 4.0.9) rails-timeago (= 2.16.0) rb-fsevent (= 0.9.8) rb-inotify (= 0.9.8) From 5c487a3a83778797402010bae25f70efae387e6c Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 01:36:56 +0200 Subject: [PATCH 22/58] Bump leaflet-rails --- Gemfile | 2 +- Gemfile.lock | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index d589f2927..46f373023 100644 --- a/Gemfile +++ b/Gemfile @@ -130,7 +130,7 @@ gem "rails-i18n", "4.0.9" gem "markerb", "1.1.0" # Map -gem "leaflet-rails", "0.7.7" +gem "leaflet-rails", "1.1.0" # Parsing diff --git a/Gemfile.lock b/Gemfile.lock index 362193746..ec90b7b2b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -339,7 +339,8 @@ GEM multi_json jwt (1.5.6) kgio (2.11.0) - leaflet-rails (0.7.7) + leaflet-rails (1.1.0) + rails (>= 4.2.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -803,7 +804,7 @@ DEPENDENCIES js_image_paths (= 0.1.0) json (= 2.1.0) json-schema (= 2.8.0) - leaflet-rails (= 0.7.7) + leaflet-rails (= 1.1.0) logging-rails (= 0.5.0) markerb (= 1.1.0) mini_magick (= 4.8.0) From d14d1616ff6220e1619248803ae2067152efbdbc Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 01:41:25 +0200 Subject: [PATCH 23/58] Bump nokogiri --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 46f373023..6e7d9bc4e 100644 --- a/Gemfile +++ b/Gemfile @@ -134,7 +134,7 @@ gem "leaflet-rails", "1.1.0" # Parsing -gem "nokogiri", "1.7.2" +gem "nokogiri", "1.8.0" gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb gem "redcarpet", "3.4.0" gem "ruby-oembed", "0.10.1" diff --git a/Gemfile.lock b/Gemfile.lock index ec90b7b2b..55a0ae691 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -366,7 +366,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_magick (4.8.0) - mini_portile2 (2.1.0) + mini_portile2 (2.2.0) minitest (5.10.3) mobile-fu (1.3.1) rack-mobile-detect @@ -379,8 +379,8 @@ GEM naught (1.1.0) nenv (0.3.0) nio4r (2.0.0) - nokogiri (1.7.2) - mini_portile2 (~> 2.1.0) + nokogiri (1.8.0) + mini_portile2 (~> 2.2.0) notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) @@ -811,7 +811,7 @@ DEPENDENCIES minitest mobile-fu (= 1.3.1) mysql2 (= 0.4.8) - nokogiri (= 1.7.2) + nokogiri (= 1.8.0) omniauth (= 1.4.2) omniauth-facebook (= 4.0.0) omniauth-tumblr (= 1.2) From d646563c7cd522cc0ca2f504b5999930aeb3f130 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 01:45:46 +0200 Subject: [PATCH 24/58] Bump ruby-oembed --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 6e7d9bc4e..4b2e66f4e 100644 --- a/Gemfile +++ b/Gemfile @@ -137,7 +137,7 @@ gem "leaflet-rails", "1.1.0" gem "nokogiri", "1.8.0" gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb gem "redcarpet", "3.4.0" -gem "ruby-oembed", "0.10.1" +gem "ruby-oembed", "0.12.0" gem "twitter-text", "1.14.5" # RTL support diff --git a/Gemfile.lock b/Gemfile.lock index 55a0ae691..38daffd08 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -602,7 +602,7 @@ GEM rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-oembed (0.10.1) + ruby-oembed (0.12.0) ruby-progressbar (1.8.1) ruby_dep (1.5.0) rubyzip (1.2.1) @@ -864,7 +864,7 @@ DEPENDENCIES responders (= 2.4.0) rspec-rails (= 3.5.2) rubocop (= 0.48.1) - ruby-oembed (= 0.10.1) + ruby-oembed (= 0.12.0) rubyzip (= 1.2.1) sass-rails (= 5.0.6) secure_headers (= 3.6.1) From ea73138eb88e792b885e0315079640e887bcb1e8 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 01:51:32 +0200 Subject: [PATCH 25/58] Bump twitter-text --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 4b2e66f4e..1bd93f4b4 100644 --- a/Gemfile +++ b/Gemfile @@ -138,7 +138,7 @@ gem "nokogiri", "1.8.0" gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb gem "redcarpet", "3.4.0" gem "ruby-oembed", "0.12.0" -gem "twitter-text", "1.14.5" +gem "twitter-text", "1.14.7" # RTL support diff --git a/Gemfile.lock b/Gemfile.lock index 38daffd08..edbb2a0d7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -700,7 +700,7 @@ GEM memoizable (~> 0.4.2) naught (~> 1.1) simple_oauth (~> 0.3.1) - twitter-text (1.14.5) + twitter-text (1.14.7) unf (~> 0.1.0) typhoeus (1.1.2) ethon (>= 0.9.0) @@ -710,7 +710,7 @@ GEM execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.7.2) + unf_ext (0.0.7.4) unicode-display_width (1.1.3) unicorn (5.3.0) kgio (~> 2.6) @@ -884,7 +884,7 @@ DEPENDENCIES timecop (= 0.8.1) turbo_dev_assets (= 0.0.2) twitter (= 6.1.0) - twitter-text (= 1.14.5) + twitter-text (= 1.14.7) typhoeus (= 1.1.2) uglifier (= 3.2.0) unicorn (= 5.3.0) From 8f3fccf0b23ea9c74055d4a9c5b603d71c853401 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 02:03:17 +0200 Subject: [PATCH 26/58] Bump secure_headers --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 1bd93f4b4..d1fa7eba7 100644 --- a/Gemfile +++ b/Gemfile @@ -146,7 +146,7 @@ gem "string-direction", "1.2.0" # Security Headers -gem "secure_headers", "3.6.1" +gem "secure_headers", "3.6.7" # Services diff --git a/Gemfile.lock b/Gemfile.lock index edbb2a0d7..016f95a9a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -623,7 +623,7 @@ GEM scss_lint (0.53.0) rake (>= 0.9, < 13) sass (~> 3.4.20) - secure_headers (3.6.1) + secure_headers (3.6.7) useragent securecompare (1.0.0) shellany (0.0.1) @@ -867,7 +867,7 @@ DEPENDENCIES ruby-oembed (= 0.12.0) rubyzip (= 1.2.1) sass-rails (= 5.0.6) - secure_headers (= 3.6.1) + secure_headers (= 3.6.7) shoulda-matchers (= 3.1.1) sidekiq (= 4.2.10) sidekiq-cron (= 0.6.3) From e773e4512118faef8795709d02c93736fccac656 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 02:11:34 +0200 Subject: [PATCH 27/58] Bump omniauth --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index d1fa7eba7..583104a2e 100644 --- a/Gemfile +++ b/Gemfile @@ -150,7 +150,7 @@ gem "secure_headers", "3.6.7" # Services -gem "omniauth", "1.4.2" +gem "omniauth", "1.6.1" gem "omniauth-facebook", "4.0.0" gem "omniauth-tumblr", "1.2" gem "omniauth-twitter", "1.4.0" diff --git a/Gemfile.lock b/Gemfile.lock index 016f95a9a..f590523ba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -284,7 +284,7 @@ GEM sprockets (>= 2.0.0) tilt (>= 1.2) hashdiff (0.3.2) - hashie (3.5.5) + hashie (3.5.6) hike (1.2.3) hitimes (1.2.4) http (2.2.1) @@ -393,9 +393,9 @@ GEM rack (>= 1.2, < 3) octokit (4.7.0) sawyer (~> 0.8.0, >= 0.5.3) - omniauth (1.4.2) - hashie (>= 1.2, < 4) - rack (>= 1.0, < 3) + omniauth (1.6.1) + hashie (>= 3.4.6, < 3.6.0) + rack (>= 1.6.2, < 3) omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) omniauth-oauth (1.1.0) @@ -812,7 +812,7 @@ DEPENDENCIES mobile-fu (= 1.3.1) mysql2 (= 0.4.8) nokogiri (= 1.8.0) - omniauth (= 1.4.2) + omniauth (= 1.6.1) omniauth-facebook (= 4.0.0) omniauth-tumblr (= 1.2) omniauth-twitter (= 1.4.0) From 9b70060f10e8ca049f00a888b946a1588df80b9e Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 02:28:51 +0200 Subject: [PATCH 28/58] Bump openid_connect --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 583104a2e..5eb0d5413 100644 --- a/Gemfile +++ b/Gemfile @@ -158,7 +158,7 @@ gem "twitter", "6.1.0" gem "omniauth-wordpress", "0.2.2" # OpenID Connect -gem "openid_connect", "0.12.0" +gem "openid_connect", "1.1.2" # Serializers diff --git a/Gemfile.lock b/Gemfile.lock index f590523ba..9ec61ad26 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -59,7 +59,7 @@ GEM autoprefixer-rails (7.1.2.3) execjs bcrypt (3.1.11) - bindata (2.3.5) + bindata (2.4.0) bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) @@ -327,7 +327,7 @@ GEM js_image_paths (0.1.0) rails (~> 4.0) json (2.1.0) - json-jwt (1.7.1) + json-jwt (1.7.2) activesupport bindata multi_json (>= 1.3) @@ -415,12 +415,12 @@ GEM open_graph_reader (0.6.2) faraday (>= 0.9.0) nokogiri (~> 1.6) - openid_connect (0.12.0) + openid_connect (1.1.2) activemodel attr_required (>= 1.0.0) json (>= 1.4.3) json-jwt (>= 1.5.0) - rack-oauth2 (>= 1.3.1) + rack-oauth2 (>= 1.6.1) swd (>= 1.0.0) tzinfo validate_email @@ -472,7 +472,7 @@ GEM activesupport rack-mobile-detect (0.4.0) rack - rack-oauth2 (1.5.1) + rack-oauth2 (1.6.2) activesupport (>= 2.3) attr_required (>= 0.0.5) httpclient (>= 2.4) @@ -818,7 +818,7 @@ DEPENDENCIES omniauth-twitter (= 1.4.0) omniauth-wordpress (= 0.2.2) open_graph_reader (= 0.6.2) - openid_connect (= 0.12.0) + openid_connect (= 1.1.2) pg (= 0.21.0) poltergeist (= 1.13.0) pronto (= 0.9.3) From c81aadd5746c67d640d3493f7bd7dd7eb0988485 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 03:27:08 +0200 Subject: [PATCH 29/58] Bump active_model_serializers --- Gemfile | 2 +- Gemfile.lock | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 5eb0d5413..a75a9ef7e 100644 --- a/Gemfile +++ b/Gemfile @@ -162,7 +162,7 @@ gem "openid_connect", "1.1.2" # Serializers -gem "active_model_serializers", "0.9.5" +gem "active_model_serializers", "0.9.7" # XMPP chat dependencies gem "diaspora-prosody-config", "0.0.7" diff --git a/Gemfile.lock b/Gemfile.lock index 9ec61ad26..1c51fc884 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,8 +21,9 @@ GEM erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - active_model_serializers (0.9.5) + active_model_serializers (0.9.7) activemodel (>= 3.2) + concurrent-ruby (~> 1.0) activejob (4.2.9) activesupport (= 4.2.9) globalid (>= 0.3.0) @@ -755,7 +756,7 @@ PLATFORMS ruby DEPENDENCIES - active_model_serializers (= 0.9.5) + active_model_serializers (= 0.9.7) activerecord-import (= 0.19.1) acts-as-taggable-on (= 3.5.0) acts_as_api (= 1.0.0) From f7f4d50131c9206f760a082feb03d464dfc364a8 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 03:40:18 +0200 Subject: [PATCH 30/58] Bump addressable --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a75a9ef7e..397b84974 100644 --- a/Gemfile +++ b/Gemfile @@ -174,7 +174,7 @@ gem "acts-as-taggable-on", "3.5.0" # URIs and HTTP -gem "addressable", "2.5.0", require: "addressable/uri" +gem "addressable", "2.5.1", require: "addressable/uri" gem "faraday", "0.11.0" # also update User-Agent in OpenID specs gem "faraday_middleware", "0.11.0.1" gem "faraday-cookie_jar", "0.0.6" diff --git a/Gemfile.lock b/Gemfile.lock index 1c51fc884..d4796a0cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -47,7 +47,7 @@ GEM activemodel (>= 3.0.0) activesupport (>= 3.0.0) rack (>= 1.1.0) - addressable (2.5.0) + addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) arel (6.0.4) asset_sync (2.0.0) @@ -760,7 +760,7 @@ DEPENDENCIES activerecord-import (= 0.19.1) acts-as-taggable-on (= 3.5.0) acts_as_api (= 1.0.0) - addressable (= 2.5.0) + addressable (= 2.5.1) asset_sync (= 2.0.0) autoprefixer-rails (= 7.1.2.3) bootstrap-sass (= 3.3.7) From b0d27b6907334784c6f3d49d151ae7a4ffcd1d80 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 03:51:15 +0200 Subject: [PATCH 31/58] Bump hamlit --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 397b84974..fe76074be 100644 --- a/Gemfile +++ b/Gemfile @@ -183,7 +183,7 @@ gem "typhoeus", "1.1.2" # Views gem "gon", "6.1.0" -gem "hamlit", "2.8.0" +gem "hamlit", "2.8.4" gem "mobile-fu", "1.3.1" gem "rails-timeago", "2.16.0" gem "will_paginate", "3.1.5" diff --git a/Gemfile.lock b/Gemfile.lock index d4796a0cd..51522cb92 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -276,7 +276,7 @@ GEM rake (>= 10, < 13) rubocop (>= 0.47.0) sysexits (~> 1.1) - hamlit (2.8.0) + hamlit (2.8.4) temple (>= 0.8.0) thor tilt @@ -793,7 +793,7 @@ DEPENDENCIES guard-rspec (= 4.7.3) guard-rubocop (= 1.2.0) haml_lint (= 0.24.0) - hamlit (= 2.8.0) + hamlit (= 2.8.4) handlebars_assets (= 0.23.2) http_accept_language (= 2.1.1) i18n-inflector-rails (= 1.0.7) From 3355f9ee16839a66c402c40d069f67d25ca98201 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 03:53:11 +0200 Subject: [PATCH 32/58] Bump will_paginate --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index fe76074be..230e67d04 100644 --- a/Gemfile +++ b/Gemfile @@ -186,7 +186,7 @@ gem "gon", "6.1.0" gem "hamlit", "2.8.4" gem "mobile-fu", "1.3.1" gem "rails-timeago", "2.16.0" -gem "will_paginate", "3.1.5" +gem "will_paginate", "3.1.6" # Logging diff --git a/Gemfile.lock b/Gemfile.lock index 51522cb92..c9c72e014 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -747,7 +747,7 @@ GEM websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) - will_paginate (3.1.5) + will_paginate (3.1.6) xpath (2.0.0) nokogiri (~> 1.3) yard (0.9.8) @@ -893,7 +893,7 @@ DEPENDENCIES uuid (= 2.3.8) versionist (= 1.5.0) webmock (= 2.3.2) - will_paginate (= 3.1.5) + will_paginate (= 3.1.6) BUNDLED WITH 1.15.3 From 5866836557481bcaf06fb5912df2f0f1e0493b3b Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 03:55:06 +0200 Subject: [PATCH 33/58] Bump logging-rails --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 230e67d04..88d7ccec2 100644 --- a/Gemfile +++ b/Gemfile @@ -190,7 +190,7 @@ gem "will_paginate", "3.1.6" # Logging -gem "logging-rails", "0.5.0", require: "logging/rails" +gem "logging-rails", "0.6.0", require: "logging/rails" # Reading and writing zip files diff --git a/Gemfile.lock b/Gemfile.lock index c9c72e014..2c04e0174 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -347,10 +347,10 @@ GEM rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) little-plugger (1.1.4) - logging (2.1.0) + logging (2.2.2) little-plugger (~> 1.1) multi_json (~> 1.10) - logging-rails (0.5.0) + logging-rails (0.6.0) logging (>= 1.8) loofah (2.0.3) nokogiri (>= 1.5.9) @@ -806,7 +806,7 @@ DEPENDENCIES json (= 2.1.0) json-schema (= 2.8.0) leaflet-rails (= 1.1.0) - logging-rails (= 0.5.0) + logging-rails (= 0.6.0) markerb (= 1.1.0) mini_magick (= 4.8.0) minitest From fc45740dae3f34adf57ba0239eef79b41ae7b564 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 04:01:05 +0200 Subject: [PATCH 34/58] Bump eye --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 88d7ccec2..deb6b558d 100644 --- a/Gemfile +++ b/Gemfile @@ -226,7 +226,7 @@ group :production do # we don"t install these on travis to speed up test runs # Process management - gem "eye", "0.9.1" + gem "eye", "0.9.2" # Redirects diff --git a/Gemfile.lock b/Gemfile.lock index 2c04e0174..fbe24c684 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -193,7 +193,7 @@ GEM ffi (>= 1.3.0) excon (0.57.1) execjs (2.7.0) - eye (0.9.1) + eye (0.9.2) celluloid (~> 0.17.3) celluloid-io (~> 0.17.0) sigar (~> 0.7.3) @@ -287,7 +287,7 @@ GEM hashdiff (0.3.2) hashie (3.5.6) hike (1.2.3) - hitimes (1.2.4) + hitimes (1.2.5) http (2.2.1) addressable (~> 2.3) http-cookie (~> 1.0) @@ -379,7 +379,7 @@ GEM mysql2 (0.4.8) naught (1.1.0) nenv (0.3.0) - nio4r (2.0.0) + nio4r (2.1.0) nokogiri (1.8.0) mini_portile2 (~> 2.2.0) notiffany (0.1.1) @@ -665,7 +665,7 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - state_machines (0.4.0) + state_machines (0.5.0) string-direction (1.2.0) yard (~> 0.8) swd (1.0.1) @@ -779,7 +779,7 @@ DEPENDENCIES diaspora_federation-rails (= 0.2.0) diaspora_federation-test (= 0.2.0) entypo-rails (= 3.0.0) - eye (= 0.9.1) + eye (= 0.9.2) factory_girl_rails (= 4.8.0) faraday (= 0.11.0) faraday-cookie_jar (= 0.0.6) From ac2265d4b4bd7ed93d5b0231b97ea70568123ab6 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 04:08:09 +0200 Subject: [PATCH 35/58] Bump asset_sync --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index deb6b558d..22ea97ef7 100644 --- a/Gemfile +++ b/Gemfile @@ -235,7 +235,7 @@ group :production do # we don"t install these on travis to speed up test runs # Third party asset hosting - gem "asset_sync", "2.0.0", require: false + gem "asset_sync", "2.2.0", require: false end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index fbe24c684..80fb79231 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,10 +50,10 @@ GEM addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) arel (6.0.4) - asset_sync (2.0.0) - activemodel + asset_sync (2.2.0) + activemodel (>= 4.1.0) fog-core - mime-types + mime-types (>= 2.99) unf ast (2.3.0) attr_required (1.0.1) @@ -761,7 +761,7 @@ DEPENDENCIES acts-as-taggable-on (= 3.5.0) acts_as_api (= 1.0.0) addressable (= 2.5.1) - asset_sync (= 2.0.0) + asset_sync (= 2.2.0) autoprefixer-rails (= 7.1.2.3) bootstrap-sass (= 3.3.7) bootstrap-switch-rails (= 3.3.3) From f56d80f59d42418e5690fe3dc24b6bc1ec8cb510 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 04:10:14 +0200 Subject: [PATCH 36/58] Bump guard-rubocop --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 22ea97ef7..bbe9ff4f8 100644 --- a/Gemfile +++ b/Gemfile @@ -243,7 +243,7 @@ group :development do gem "guard", "2.14.1", require: false gem "guard-cucumber", "2.1.2", require: false gem "guard-rspec", "4.7.3", require: false - gem "guard-rubocop", "1.2.0", require: false + gem "guard-rubocop", "1.3.0", require: false gem "rb-fsevent", "0.9.8", require: false gem "rb-inotify", "0.9.8", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 80fb79231..5d5cd002c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -265,7 +265,7 @@ GEM guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - guard-rubocop (1.2.0) + guard-rubocop (1.3.0) guard (~> 2.0) rubocop (~> 0.20) haml (4.0.7) @@ -354,7 +354,7 @@ GEM logging (>= 1.8) loofah (2.0.3) nokogiri (>= 1.5.9) - lumberjack (1.0.11) + lumberjack (1.0.12) macaddr (1.7.1) systemu (~> 2.6.2) mail (2.6.6) @@ -791,7 +791,7 @@ DEPENDENCIES guard (= 2.14.1) guard-cucumber (= 2.1.2) guard-rspec (= 4.7.3) - guard-rubocop (= 1.2.0) + guard-rubocop (= 1.3.0) haml_lint (= 0.24.0) hamlit (= 2.8.4) handlebars_assets (= 0.23.2) From 18f88ce252836ef18f40c3105a878e816989764c Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 04:12:33 +0200 Subject: [PATCH 37/58] Bump rb-fsevent --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index bbe9ff4f8..32a6f6f5c 100644 --- a/Gemfile +++ b/Gemfile @@ -244,7 +244,7 @@ group :development do gem "guard-cucumber", "2.1.2", require: false gem "guard-rspec", "4.7.3", require: false gem "guard-rubocop", "1.3.0", require: false - gem "rb-fsevent", "0.9.8", require: false + gem "rb-fsevent", "0.10.2", require: false gem "rb-inotify", "0.9.8", require: false # Linters diff --git a/Gemfile.lock b/Gemfile.lock index 5d5cd002c..c8b0a4836 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -567,7 +567,7 @@ GEM rake raindrops (0.18.0) rake (12.0.0) - rb-fsevent (0.9.8) + rb-fsevent (0.10.2) rb-inotify (0.9.8) ffi (>= 0.5.0) redcarpet (3.4.0) @@ -859,7 +859,7 @@ DEPENDENCIES rails-assets-perfect-scrollbar (= 0.6.16)! rails-i18n (= 4.0.9) rails-timeago (= 2.16.0) - rb-fsevent (= 0.9.8) + rb-fsevent (= 0.10.2) rb-inotify (= 0.9.8) redcarpet (= 3.4.0) responders (= 2.4.0) From 9031f4b772234820109c8e47f9210aa1d35b3d4c Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 04:14:51 +0200 Subject: [PATCH 38/58] Bump rb-inotify --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 32a6f6f5c..6f2b47a06 100644 --- a/Gemfile +++ b/Gemfile @@ -245,7 +245,7 @@ group :development do gem "guard-rspec", "4.7.3", require: false gem "guard-rubocop", "1.3.0", require: false gem "rb-fsevent", "0.10.2", require: false - gem "rb-inotify", "0.9.8", require: false + gem "rb-inotify", "0.9.10", require: false # Linters gem "haml_lint", "0.24.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index c8b0a4836..6d9b0ecce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -568,8 +568,8 @@ GEM raindrops (0.18.0) rake (12.0.0) rb-fsevent (0.10.2) - rb-inotify (0.9.8) - ffi (>= 0.5.0) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) redcarpet (3.4.0) redis (3.3.3) request_store (1.3.2) @@ -860,7 +860,7 @@ DEPENDENCIES rails-i18n (= 4.0.9) rails-timeago (= 2.16.0) rb-fsevent (= 0.10.2) - rb-inotify (= 0.9.8) + rb-inotify (= 0.9.10) redcarpet (= 3.4.0) responders (= 2.4.0) rspec-rails (= 3.5.2) From 07c5dfe085eb0492d0e4faa62f99163c7518a7e4 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 04:19:04 +0200 Subject: [PATCH 39/58] Bump pronto --- Gemfile | 2 +- Gemfile.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 6f2b47a06..7400c16d0 100644 --- a/Gemfile +++ b/Gemfile @@ -249,7 +249,7 @@ group :development do # Linters gem "haml_lint", "0.24.0", require: false - gem "pronto", "0.9.3", require: false + gem "pronto", "0.9.4", require: false gem "pronto-eslint", "0.9.1", require: false gem "pronto-haml", "0.9.0", require: false gem "pronto-rubocop", "0.9.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 6d9b0ecce..e80a03a12 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -237,9 +237,9 @@ GEM ruby-progressbar (~> 1.4) get_process_mem (0.2.1) gherkin (4.0.0) - gitlab (4.0.0) + gitlab (4.2.0) httparty - terminal-table (= 1.7.1) + terminal-table globalid (0.4.0) activesupport (>= 4.2.0) gon (6.1.0) @@ -437,7 +437,7 @@ GEM cliver (~> 0.3.1) websocket-driver (>= 0.2.0) powerpack (0.1.1) - pronto (0.9.3) + pronto (0.9.4) gitlab (~> 4.0, >= 4.0.0) httparty (>= 0.13.7, < 0.15) octokit (~> 4.7, >= 4.7.0) @@ -609,7 +609,7 @@ GEM rubyzip (1.2.1) rufus-scheduler (3.4.2) et-orbi (~> 1.0) - rugged (0.25.1.1) + rugged (0.26.0) safe_yaml (1.0.4) sass (3.4.25) sass-rails (5.0.6) @@ -679,8 +679,8 @@ GEM temple (0.8.0) term-ansicolor (1.4.0) tins (~> 1.0) - terminal-table (1.7.1) - unicode-display_width (~> 1.1.1) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) test_after_commit (1.1.0) activerecord (>= 3.2) thor (0.19.1) @@ -712,7 +712,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.4) - unicode-display_width (1.1.3) + unicode-display_width (1.3.0) unicorn (5.3.0) kgio (~> 2.6) raindrops (~> 0.7) @@ -822,7 +822,7 @@ DEPENDENCIES openid_connect (= 1.1.2) pg (= 0.21.0) poltergeist (= 1.13.0) - pronto (= 0.9.3) + pronto (= 0.9.4) pronto-eslint (= 0.9.1) pronto-haml (= 0.9.0) pronto-rubocop (= 0.9.0) From 8c27418a55a5dba57995cfc91ed583802731a1f4 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 04:24:59 +0200 Subject: [PATCH 40/58] Bump rubocop --- .rubocop.yml | 12 ++++++------ Gemfile | 2 +- Gemfile.lock | 6 ++++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 2ebb26cff..91f28fdb1 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -40,7 +40,7 @@ Metrics/BlockLength: # No space makes the method definition shorter and differentiates # from a regular assignment. -Style/SpaceAroundEqualsInParameterDefault: +Layout/SpaceAroundEqualsInParameterDefault: EnforcedStyle: no_space # Single quotes being faster is hardly measurable and only affects parse time. @@ -55,7 +55,7 @@ Style/SymbolArray: Enabled: true # Most readable form. -Style/AlignHash: +Layout/AlignHash: EnforcedHashRocketStyle: table EnforcedColonStyle: table @@ -92,7 +92,7 @@ Style/RaiseArgs: # Indenting the chained dots beneath each other is not supported by this cop, # see https://github.com/bbatsov/rubocop/issues/1633 -Style/MultilineOperationIndentation: +Layout/MultilineOperationIndentation: Enabled: false # Fail is an alias of raise. Avoid aliases, it's more cognitive load for no gain. @@ -107,7 +107,7 @@ Style/SignalException: Lint/HandleExceptions: Enabled: false -Style/SpaceInsideBlockBraces: +Layout/SpaceInsideBlockBraces: # The space here provides no real gain in readability while consuming # horizontal space that could be used for a better parameter name. # Also {| differentiates better from a hash than { | does. @@ -115,7 +115,7 @@ Style/SpaceInsideBlockBraces: # No trailing space differentiates better from the block: # foo} means hash, foo } means block. -Style/SpaceInsideHashLiteralBraces: +Layout/SpaceInsideHashLiteralBraces: EnforcedStyle: no_space # { ... } for multi-line blocks is okay, follow Weirichs rule instead: @@ -165,7 +165,7 @@ Style/NumericPredicate: EnforcedStyle: comparison # Reset some HoundCI changes back to Rubocop defaults -Style/DotPosition: +Layout/DotPosition: EnforcedStyle: leading ### backward compatibility diff --git a/Gemfile b/Gemfile index 7400c16d0..f8db0150d 100644 --- a/Gemfile +++ b/Gemfile @@ -254,7 +254,7 @@ group :development do gem "pronto-haml", "0.9.0", require: false gem "pronto-rubocop", "0.9.0", require: false gem "pronto-scss", "0.9.1", require: false - gem "rubocop", "0.48.1", require: false + gem "rubocop", "0.49.1", require: false # Preloading environment diff --git a/Gemfile.lock b/Gemfile.lock index e80a03a12..08e36fb9f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -428,6 +428,7 @@ GEM validate_url webfinger (>= 1.0.1) orm_adapter (0.5.0) + parallel (1.11.2) parser (2.4.0.0) ast (~> 2.2) pg (0.21.0) @@ -597,7 +598,8 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - rubocop (0.48.1) + rubocop (0.49.1) + parallel (~> 1.10) parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) @@ -864,7 +866,7 @@ DEPENDENCIES redcarpet (= 3.4.0) responders (= 2.4.0) rspec-rails (= 3.5.2) - rubocop (= 0.48.1) + rubocop (= 0.49.1) ruby-oembed (= 0.12.0) rubyzip (= 1.2.1) sass-rails (= 5.0.6) From 7a0f0363e9a1f5ada1d24a868786c415a3581414 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 04:27:17 +0200 Subject: [PATCH 41/58] Bump haml_lint --- Gemfile | 2 +- Gemfile.lock | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index f8db0150d..03eacfd73 100644 --- a/Gemfile +++ b/Gemfile @@ -248,7 +248,7 @@ group :development do gem "rb-inotify", "0.9.10", require: false # Linters - gem "haml_lint", "0.24.0", require: false + gem "haml_lint", "0.26.0", require: false gem "pronto", "0.9.4", require: false gem "pronto-eslint", "0.9.1", require: false gem "pronto-haml", "0.9.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 08e36fb9f..2800224d9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -268,13 +268,14 @@ GEM guard-rubocop (1.3.0) guard (~> 2.0) rubocop (~> 0.20) - haml (4.0.7) + haml (5.0.1) + temple (>= 0.8.0) tilt - haml_lint (0.24.0) + haml_lint (0.26.0) haml (>= 4.0, < 5.1) rainbow rake (>= 10, < 13) - rubocop (>= 0.47.0) + rubocop (>= 0.49.0) sysexits (~> 1.1) hamlit (2.8.4) temple (>= 0.8.0) @@ -794,7 +795,7 @@ DEPENDENCIES guard-cucumber (= 2.1.2) guard-rspec (= 4.7.3) guard-rubocop (= 1.3.0) - haml_lint (= 0.24.0) + haml_lint (= 0.26.0) hamlit (= 2.8.4) handlebars_assets (= 0.23.2) http_accept_language (= 2.1.1) From 6f1571bc1b25a6dc3e5d4d0431791ac440ea1da8 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 04:29:14 +0200 Subject: [PATCH 42/58] Bump spring --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 03eacfd73..eff4c3180 100644 --- a/Gemfile +++ b/Gemfile @@ -258,7 +258,7 @@ group :development do # Preloading environment - gem "spring", "2.0.1" + gem "spring", "2.0.2" gem "spring-commands-rspec", "1.0.4" gem "spring-commands-cucumber", "1.0.1" diff --git a/Gemfile.lock b/Gemfile.lock index 2800224d9..a12d2a793 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -653,7 +653,7 @@ GEM sinon-rails (1.15.0) railties (>= 3.1) slop (3.6.0) - spring (2.0.1) + spring (2.0.2) activesupport (>= 4.2) spring-commands-cucumber (1.0.1) spring (>= 0.9.1) @@ -878,7 +878,7 @@ DEPENDENCIES simple_captcha2 (= 0.4.3) simplecov (= 0.12.0) sinon-rails (= 1.15.0) - spring (= 2.0.1) + spring (= 2.0.2) spring-commands-cucumber (= 1.0.1) spring-commands-rspec (= 1.0.4) sprockets (= 2.12.4) From ccf938c95ebf7f2cbb53d40a010bfec49dc9d03f Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 04:51:54 +0200 Subject: [PATCH 43/58] Bump fixture_builder --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index eff4c3180..582295c9b 100644 --- a/Gemfile +++ b/Gemfile @@ -275,7 +275,7 @@ end group :test do # RSpec (unit tests, some integration tests) - gem "fixture_builder", "0.4.1" + gem "fixture_builder", "0.5.0" gem "fuubar", "2.2.0" gem "test_after_commit", "1.1.0" diff --git a/Gemfile.lock b/Gemfile.lock index a12d2a793..7f6c800af 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -213,7 +213,7 @@ GEM faraday_middleware (0.11.0.1) faraday (>= 0.7.4, < 1.0) ffi (1.9.18) - fixture_builder (0.4.1) + fixture_builder (0.5.0) activerecord (>= 2) activesupport (>= 2) fog-aws (1.4.0) @@ -787,7 +787,7 @@ DEPENDENCIES faraday (= 0.11.0) faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.11.0.1) - fixture_builder (= 0.4.1) + fixture_builder (= 0.5.0) fog-aws (= 1.4.0) fuubar (= 2.2.0) gon (= 6.1.0) From 7759de83838ad9cc041ab38b7eb4b0d333d25c3c Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 04:54:03 +0200 Subject: [PATCH 44/58] Bump capybara --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 582295c9b..ce239b81b 100644 --- a/Gemfile +++ b/Gemfile @@ -281,7 +281,7 @@ group :test do # Cucumber (integration tests) - gem "capybara", "2.12.1" + gem "capybara", "2.14.4" gem "database_cleaner", "1.5.3" gem "poltergeist", "1.13.0" diff --git a/Gemfile.lock b/Gemfile.lock index 7f6c800af..9b2c512ff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -68,7 +68,7 @@ GEM buftok (0.2.0) builder (3.2.3) byebug (9.0.6) - capybara (2.12.1) + capybara (2.14.4) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -751,7 +751,7 @@ GEM websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) will_paginate (3.1.6) - xpath (2.0.0) + xpath (2.1.0) nokogiri (~> 1.3) yard (0.9.8) @@ -768,7 +768,7 @@ DEPENDENCIES autoprefixer-rails (= 7.1.2.3) bootstrap-sass (= 3.3.7) bootstrap-switch-rails (= 3.3.3) - capybara (= 2.12.1) + capybara (= 2.14.4) carrierwave (= 1.1.0) compass-rails (= 3.0.2) configurate (= 0.3.1) From bfdcb5481a098060a0712a4aa65ad5c76ade4255 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 04:55:41 +0200 Subject: [PATCH 45/58] Bump database_cleaner --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index ce239b81b..b1bbbb9da 100644 --- a/Gemfile +++ b/Gemfile @@ -282,7 +282,7 @@ group :test do # Cucumber (integration tests) gem "capybara", "2.14.4" - gem "database_cleaner", "1.5.3" + gem "database_cleaner", "1.6.1" gem "poltergeist", "1.13.0" gem "cucumber-api-steps", "0.13", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 9b2c512ff..3b23e20f3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -151,7 +151,7 @@ GEM nokogiri (~> 1.5) railties (>= 3, < 5.1) cucumber-wire (0.0.1) - database_cleaner (1.5.3) + database_cleaner (1.6.1) devise (4.3.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -775,7 +775,7 @@ DEPENDENCIES coveralls cucumber-api-steps (= 0.13) cucumber-rails (= 1.4.5) - database_cleaner (= 1.5.3) + database_cleaner (= 1.6.1) devise (= 4.3.0) devise_lastseenable (= 0.0.6) diaspora-prosody-config (= 0.0.7) From 5bec57cfc9ace38687857a9ccaf32ed97fda30c4 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 04:58:50 +0200 Subject: [PATCH 46/58] Bump poltergeist --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index b1bbbb9da..50af78f30 100644 --- a/Gemfile +++ b/Gemfile @@ -283,7 +283,7 @@ group :test do gem "capybara", "2.14.4" gem "database_cleaner", "1.6.1" - gem "poltergeist", "1.13.0" + gem "poltergeist", "1.15.0" gem "cucumber-api-steps", "0.13", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 3b23e20f3..00366f7a7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -434,7 +434,7 @@ GEM ast (~> 2.2) pg (0.21.0) phantomjs (2.1.1.0) - poltergeist (1.13.0) + poltergeist (1.15.0) capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) @@ -824,7 +824,7 @@ DEPENDENCIES open_graph_reader (= 0.6.2) openid_connect (= 1.1.2) pg (= 0.21.0) - poltergeist (= 1.13.0) + poltergeist (= 1.15.0) pronto (= 0.9.4) pronto-eslint (= 0.9.1) pronto-haml (= 0.9.0) From 026fe3dc3d6a637d52cc598adecf5c12a7567265 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 05:01:30 +0200 Subject: [PATCH 47/58] Bump timecop --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 50af78f30..41476b3bb 100644 --- a/Gemfile +++ b/Gemfile @@ -290,7 +290,7 @@ group :test do # General helpers gem "factory_girl_rails", "4.8.0" - gem "timecop", "0.8.1" + gem "timecop", "0.9.1" gem "webmock", "2.3.2", require: false gem "shoulda-matchers", "3.1.1" diff --git a/Gemfile.lock b/Gemfile.lock index 00366f7a7..4758e9384 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -689,7 +689,7 @@ GEM thor (0.19.1) thread_safe (0.3.6) tilt (1.4.1) - timecop (0.8.1) + timecop (0.9.1) timers (4.1.2) hitimes tins (1.13.2) @@ -885,7 +885,7 @@ DEPENDENCIES string-direction (= 1.2.0) test_after_commit (= 1.1.0) thor (= 0.19.1) - timecop (= 0.8.1) + timecop (= 0.9.1) turbo_dev_assets (= 0.0.2) twitter (= 6.1.0) twitter-text (= 1.14.7) From c44ca18e8f21c1fc97b25fee8d43620de95425ef Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 05:02:28 +0200 Subject: [PATCH 48/58] Bump webmock --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 41476b3bb..92cc2ab58 100644 --- a/Gemfile +++ b/Gemfile @@ -291,7 +291,7 @@ group :test do gem "factory_girl_rails", "4.8.0" gem "timecop", "0.9.1" - gem "webmock", "2.3.2", require: false + gem "webmock", "3.0.1", require: false gem "shoulda-matchers", "3.1.1" gem "diaspora_federation-test", "0.2.0" diff --git a/Gemfile.lock b/Gemfile.lock index 4758e9384..a9363be1b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -285,7 +285,7 @@ GEM execjs (~> 2.0) sprockets (>= 2.0.0) tilt (>= 1.2) - hashdiff (0.3.2) + hashdiff (0.3.4) hashie (3.5.6) hike (1.2.3) hitimes (1.2.5) @@ -743,7 +743,7 @@ GEM activesupport httpclient (>= 2.4) multi_json - webmock (2.3.2) + webmock (3.0.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -895,7 +895,7 @@ DEPENDENCIES unicorn-worker-killer (= 0.4.4) uuid (= 2.3.8) versionist (= 1.5.0) - webmock (= 2.3.2) + webmock (= 3.0.1) will_paginate (= 3.1.6) BUNDLED WITH From 2a0cb17f48f11112ab9a05658f440f7803b5fd05 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 05:05:37 +0200 Subject: [PATCH 49/58] Bump shoulda-matchers --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 92cc2ab58..cc6e799ef 100644 --- a/Gemfile +++ b/Gemfile @@ -290,9 +290,9 @@ group :test do # General helpers gem "factory_girl_rails", "4.8.0" + gem "shoulda-matchers", "3.1.2" gem "timecop", "0.9.1" gem "webmock", "3.0.1", require: false - gem "shoulda-matchers", "3.1.1" gem "diaspora_federation-test", "0.2.0" diff --git a/Gemfile.lock b/Gemfile.lock index a9363be1b..c980a2923 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -631,7 +631,7 @@ GEM useragent securecompare (1.0.0) shellany (0.0.1) - shoulda-matchers (3.1.1) + shoulda-matchers (3.1.2) activesupport (>= 4.0.0) sidekiq (4.2.10) concurrent-ruby (~> 1.0) @@ -872,7 +872,7 @@ DEPENDENCIES rubyzip (= 1.2.1) sass-rails (= 5.0.6) secure_headers (= 3.6.7) - shoulda-matchers (= 3.1.1) + shoulda-matchers (= 3.1.2) sidekiq (= 4.2.10) sidekiq-cron (= 0.6.3) simple_captcha2 (= 0.4.3) From 407c4f47d298cecd38c7af2b0309f5732923f39e Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 05:08:39 +0200 Subject: [PATCH 50/58] Bump rspec --- Gemfile | 2 +- Gemfile.lock | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Gemfile b/Gemfile index cc6e799ef..9b95b1c43 100644 --- a/Gemfile +++ b/Gemfile @@ -302,7 +302,7 @@ end group :development, :test do # RSpec (unit tests, some integration tests) - gem "rspec-rails", "3.5.2" + gem "rspec-rails", "3.6.0" # Cucumber (integration tests) gem "cucumber-rails", "1.4.5", require: false diff --git a/Gemfile.lock b/Gemfile.lock index c980a2923..4bf6f59d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -578,27 +578,27 @@ GEM responders (2.4.0) actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) - rspec (3.5.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec (3.6.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.6.0) + rspec-rails (3.6.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) rubocop (0.49.1) parallel (~> 1.10) parser (>= 2.3.3.1, < 3.0) @@ -866,7 +866,7 @@ DEPENDENCIES rb-inotify (= 0.9.10) redcarpet (= 3.4.0) responders (= 2.4.0) - rspec-rails (= 3.5.2) + rspec-rails (= 3.6.0) rubocop (= 0.49.1) ruby-oembed (= 0.12.0) rubyzip (= 1.2.1) From a00defe0eb2ea90124b675b9b33dacac0b40e733 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 05:11:05 +0200 Subject: [PATCH 51/58] Bump cucumber-rails --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 9b95b1c43..c149c1cd1 100644 --- a/Gemfile +++ b/Gemfile @@ -305,7 +305,7 @@ group :development, :test do gem "rspec-rails", "3.6.0" # Cucumber (integration tests) - gem "cucumber-rails", "1.4.5", require: false + gem "cucumber-rails", "1.5.0", require: false # Jasmine (client side application tests (JS)) gem "jasmine", "2.5.2" diff --git a/Gemfile.lock b/Gemfile.lock index 4bf6f59d1..eaac5d18f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -144,12 +144,12 @@ GEM rspec (>= 2.12.0) cucumber-core (1.5.0) gherkin (~> 4.0) - cucumber-rails (1.4.5) + cucumber-rails (1.5.0) capybara (>= 1.1.2, < 3) cucumber (>= 1.3.8, < 4) - mime-types (>= 1.16, < 4) + mime-types (>= 1.17, < 4) nokogiri (~> 1.5) - railties (>= 3, < 5.1) + railties (>= 4, < 5.2) cucumber-wire (0.0.1) database_cleaner (1.6.1) devise (4.3.0) @@ -236,7 +236,7 @@ GEM rspec-core (~> 3.0) ruby-progressbar (~> 1.4) get_process_mem (0.2.1) - gherkin (4.0.0) + gherkin (4.1.3) gitlab (4.2.0) httparty terminal-table @@ -774,7 +774,7 @@ DEPENDENCIES configurate (= 0.3.1) coveralls cucumber-api-steps (= 0.13) - cucumber-rails (= 1.4.5) + cucumber-rails (= 1.5.0) database_cleaner (= 1.6.1) devise (= 4.3.0) devise_lastseenable (= 0.0.6) From 03241c64803ce95aa44ada8d198caa29cf93d1d2 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 05:18:47 +0200 Subject: [PATCH 52/58] Bump dependency gems --- Gemfile.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index eaac5d18f..cfa4ec1eb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -177,7 +177,7 @@ GEM uuid (~> 2.3.8) diff-lcs (1.3) docile (1.1.5) - domain_name (0.5.20170223) + domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) entypo-rails (3.0.0) railties (>= 4.1, < 6) @@ -289,14 +289,14 @@ GEM hashie (3.5.6) hike (1.2.3) hitimes (1.2.5) - http (2.2.1) + http (2.2.2) addressable (~> 2.3) http-cookie (~> 1.0) http-form_data (~> 1.0.1) http_parser.rb (~> 0.6.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (1.0.1) + http-form_data (1.0.3) http_accept_language (2.1.1) http_parser.rb (0.6.0) httparty (0.14.0) @@ -337,7 +337,7 @@ GEM url_safe_base64 json-schema (2.8.0) addressable (>= 2.4) - jsonpath (0.5.8) + jsonpath (0.8.5) multi_json jwt (1.5.6) kgio (2.11.0) @@ -386,9 +386,9 @@ GEM notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) - oauth (0.5.1) - oauth2 (1.3.1) - faraday (>= 0.8, < 0.12) + oauth (0.5.3) + oauth2 (1.4.0) + faraday (>= 0.8, < 0.13) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) @@ -521,7 +521,7 @@ GEM rails-assets-favico.js (0.3.10) rails-assets-fine-uploader (5.13.0) rails-assets-highlightjs (9.9.0) - rails-assets-jasmine (2.5.2) + rails-assets-jasmine (2.6.4) rails-assets-jasmine-ajax (3.3.1) rails-assets-jasmine (~> 2) rails-assets-jquery (3.2.1) @@ -624,7 +624,7 @@ GEM sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) - scss_lint (0.53.0) + scss_lint (0.54.0) rake (>= 0.9, < 13) sass (~> 3.4.20) secure_headers (3.6.7) @@ -649,7 +649,7 @@ GEM docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) + simplecov-html (0.10.1) sinon-rails (1.15.0) railties (>= 3.1) slop (3.6.0) @@ -680,7 +680,7 @@ GEM sysexits (1.2.0) systemu (2.6.5) temple (0.8.0) - term-ansicolor (1.4.0) + term-ansicolor (1.6.0) tins (~> 1.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) @@ -692,7 +692,7 @@ GEM timecop (0.9.1) timers (4.1.2) hitimes - tins (1.13.2) + tins (1.15.0) turbo_dev_assets (0.0.2) twitter (6.1.0) addressable (~> 2.5) @@ -753,7 +753,7 @@ GEM will_paginate (3.1.6) xpath (2.1.0) nokogiri (~> 1.3) - yard (0.9.8) + yard (0.9.9) PLATFORMS ruby From 7e9935c8b2151f36ff5a9605395e2dda0214dfd4 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 05:38:24 +0200 Subject: [PATCH 53/58] Replace jquery-ui-rails with rails-assets-jquery.ui --- Gemfile | 2 +- Gemfile.lock | 4 +--- app/assets/javascripts/main.js | 8 ++++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index c149c1cd1..3ac85a503 100644 --- a/Gemfile +++ b/Gemfile @@ -88,12 +88,12 @@ gem "entypo-rails", "3.0.0" gem "handlebars_assets", "0.23.2" gem "jquery-rails", "4.3.1" -gem "jquery-ui-rails", "5.0.5" gem "js-routes", "1.3.3" gem "js_image_paths", "0.1.0" source "https://rails-assets.org" do gem "rails-assets-jquery", "3.2.1" # Should be kept in sync with jquery-rails + gem "rails-assets-jquery.ui", "1.11.4" gem "rails-assets-highlightjs", "9.9.0" gem "rails-assets-markdown-it", "8.3.0" diff --git a/Gemfile.lock b/Gemfile.lock index cfa4ec1eb..0ceb39f95 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -321,8 +321,6 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (5.0.5) - railties (>= 3.2.16) js-routes (1.3.3) railties (>= 3.2) sprockets-rails @@ -803,7 +801,6 @@ DEPENDENCIES jasmine (= 2.5.2) jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.3.1) - jquery-ui-rails (= 5.0.5) js-routes (= 1.3.3) js_image_paths (= 0.1.0) json (= 2.1.0) @@ -852,6 +849,7 @@ DEPENDENCIES rails-assets-jquery-placeholder (= 2.3.1)! rails-assets-jquery-textchange (= 0.2.3)! rails-assets-jquery.are-you-sure (= 1.9.0)! + rails-assets-jquery.ui (= 1.11.4)! rails-assets-markdown-it (= 8.3.0)! rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)! rails-assets-markdown-it-diaspora-mention (= 1.2.0)! diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index dccddf014..a59460b96 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -10,10 +10,10 @@ //= require charcount //= require jquery-placeholder //= require jquery.timeago -//= require jquery-ui/core -//= require jquery-ui/widget -//= require jquery-ui/mouse -//= require jquery-ui/sortable +//= require jquery.ui/ui/core +//= require jquery.ui/ui/widget +//= require jquery.ui/ui/mouse +//= require jquery.ui/ui/sortable //= require keycodes //= require jquery.autoSuggest.custom //= require fine-uploader/fine-uploader.core From 652f235ff0e480b566973c2e11f6f74ca4265653 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 05:48:17 +0200 Subject: [PATCH 54/58] Bump rails-assets-autosize --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 3ac85a503..0949382bb 100644 --- a/Gemfile +++ b/Gemfile @@ -111,7 +111,7 @@ source "https://rails-assets.org" do # jQuery plugins - gem "rails-assets-autosize", "3.0.20" + gem "rails-assets-autosize", "4.0.0" gem "rails-assets-blueimp-gallery", "2.25.0" gem "rails-assets-jquery.are-you-sure", "1.9.0" gem "rails-assets-jquery-placeholder", "2.3.1" diff --git a/Gemfile.lock b/Gemfile.lock index 0ceb39f95..c21afd126 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -498,7 +498,7 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 4.2.9) sprockets-rails - rails-assets-autosize (3.0.20) + rails-assets-autosize (4.0.0) rails-assets-backbone (1.3.3) rails-assets-underscore (>= 1.8.3) rails-assets-blueimp-gallery (2.25.0) @@ -836,7 +836,7 @@ DEPENDENCIES rack-rewrite (= 1.5.1) rack-ssl (= 1.4.1) rails (= 4.2.9) - rails-assets-autosize (= 3.0.20)! + rails-assets-autosize (= 4.0.0)! rails-assets-backbone (= 1.3.3)! rails-assets-blueimp-gallery (= 2.25.0)! rails-assets-bootstrap-markdown (= 2.10.0)! From c92b1ddcc64e44e495544914af6c11907bebe14d Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 05:49:19 +0200 Subject: [PATCH 55/58] Bump rails-assets-blueimp-gallery --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 0949382bb..4b03b6153 100644 --- a/Gemfile +++ b/Gemfile @@ -112,7 +112,7 @@ source "https://rails-assets.org" do # jQuery plugins gem "rails-assets-autosize", "4.0.0" - gem "rails-assets-blueimp-gallery", "2.25.0" + gem "rails-assets-blueimp-gallery", "2.25.2" gem "rails-assets-jquery.are-you-sure", "1.9.0" gem "rails-assets-jquery-placeholder", "2.3.1" gem "rails-assets-jquery-textchange", "0.2.3" diff --git a/Gemfile.lock b/Gemfile.lock index c21afd126..522ad8b70 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -501,7 +501,7 @@ GEM rails-assets-autosize (4.0.0) rails-assets-backbone (1.3.3) rails-assets-underscore (>= 1.8.3) - rails-assets-blueimp-gallery (2.25.0) + rails-assets-blueimp-gallery (2.25.2) rails-assets-bootstrap (3.3.7) rails-assets-jquery (>= 1.9.1, < 4) rails-assets-bootstrap-markdown (2.10.0) @@ -838,7 +838,7 @@ DEPENDENCIES rails (= 4.2.9) rails-assets-autosize (= 4.0.0)! rails-assets-backbone (= 1.3.3)! - rails-assets-blueimp-gallery (= 2.25.0)! + rails-assets-blueimp-gallery (= 2.25.2)! rails-assets-bootstrap-markdown (= 2.10.0)! rails-assets-corejs-typeahead (= 1.1.1)! rails-assets-diaspora_jsxc (= 0.1.5.develop.7)! From b07114e40a758f66912330bdd1c855fbf5a5d64b Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 05:51:52 +0200 Subject: [PATCH 56/58] Bump rails-assets-highlightjs --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 4b03b6153..e8c480868 100644 --- a/Gemfile +++ b/Gemfile @@ -95,7 +95,7 @@ source "https://rails-assets.org" do gem "rails-assets-jquery", "3.2.1" # Should be kept in sync with jquery-rails gem "rails-assets-jquery.ui", "1.11.4" - gem "rails-assets-highlightjs", "9.9.0" + gem "rails-assets-highlightjs", "9.12.0" gem "rails-assets-markdown-it", "8.3.0" gem "rails-assets-markdown-it-hashtag", "0.4.0" gem "rails-assets-markdown-it-diaspora-mention", "1.2.0" diff --git a/Gemfile.lock b/Gemfile.lock index 522ad8b70..480535f05 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -518,7 +518,7 @@ GEM rails-assets-emojione (2.0.1) rails-assets-favico.js (0.3.10) rails-assets-fine-uploader (5.13.0) - rails-assets-highlightjs (9.9.0) + rails-assets-highlightjs (9.12.0) rails-assets-jasmine (2.6.4) rails-assets-jasmine-ajax (3.3.1) rails-assets-jasmine (~> 2) @@ -843,7 +843,7 @@ DEPENDENCIES rails-assets-corejs-typeahead (= 1.1.1)! rails-assets-diaspora_jsxc (= 0.1.5.develop.7)! rails-assets-fine-uploader (= 5.13.0)! - rails-assets-highlightjs (= 9.9.0)! + rails-assets-highlightjs (= 9.12.0)! rails-assets-jasmine-ajax (= 3.3.1)! rails-assets-jquery (= 3.2.1)! rails-assets-jquery-placeholder (= 2.3.1)! From c0266969be87a51fe9d810f274f090ea7d153680 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 22 Jul 2017 05:53:06 +0200 Subject: [PATCH 57/58] Bump rails-assets-markdown-it --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index e8c480868..517eb9920 100644 --- a/Gemfile +++ b/Gemfile @@ -96,7 +96,7 @@ source "https://rails-assets.org" do gem "rails-assets-jquery.ui", "1.11.4" gem "rails-assets-highlightjs", "9.12.0" - gem "rails-assets-markdown-it", "8.3.0" + gem "rails-assets-markdown-it", "8.3.1" gem "rails-assets-markdown-it-hashtag", "0.4.0" gem "rails-assets-markdown-it-diaspora-mention", "1.2.0" gem "rails-assets-markdown-it-sanitizer", "0.4.3" diff --git a/Gemfile.lock b/Gemfile.lock index 480535f05..0236aa5a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -536,7 +536,7 @@ GEM rails-assets-jquery.ui (1.11.4) rails-assets-jquery (>= 1.6) rails-assets-markdown-it--markdown-it-for-inline (0.1.1) - rails-assets-markdown-it (8.3.0) + rails-assets-markdown-it (8.3.1) rails-assets-markdown-it-diaspora-mention (1.2.0) rails-assets-markdown-it-hashtag (0.4.0) rails-assets-markdown-it-sanitizer (0.4.3) @@ -850,7 +850,7 @@ DEPENDENCIES rails-assets-jquery-textchange (= 0.2.3)! rails-assets-jquery.are-you-sure (= 1.9.0)! rails-assets-jquery.ui (= 1.11.4)! - rails-assets-markdown-it (= 8.3.0)! + rails-assets-markdown-it (= 8.3.1)! rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)! rails-assets-markdown-it-diaspora-mention (= 1.2.0)! rails-assets-markdown-it-hashtag (= 0.4.0)! From e94ec1e3c5ab40c817b10a6ccde52525f04eccca Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 23 Jul 2017 00:50:17 +0200 Subject: [PATCH 58/58] Use latest ruby-versions --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1bcd8421a..db4fad306 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: ruby rvm: - - 2.3.1 - - 2.1 + - 2.3.4 + - 2.1.10 env: - DB=postgresql BUILD_TYPE=cucumber