From da305a44cd3fc9dc3a66c5850becca479bd8b626 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 18:10:23 +0100 Subject: [PATCH 01/54] Bump asset_sync --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 80a201bf9..68a29c986 100644 --- a/Gemfile +++ b/Gemfile @@ -234,7 +234,7 @@ group :production do # we don"t install these on travis to speed up test runs # Third party asset hosting - gem "asset_sync", "2.4.0", require: false + gem "asset_sync", "2.5.0", require: false end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 147d7697f..7e3647cfb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -54,7 +54,7 @@ GEM public_suffix (>= 2.0.2, < 4.0) aes_key_wrap (1.0.1) arel (8.0.0) - asset_sync (2.4.0) + asset_sync (2.5.0) activemodel (>= 4.1.0) fog-core mime-types (>= 2.99) @@ -123,7 +123,7 @@ GEM compass (~> 1.0.0) sass-rails (< 5.1) sprockets (< 4.0) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.3) configurate (0.3.1) connection_pool (2.2.1) coveralls (0.8.21) @@ -306,7 +306,7 @@ GEM httparty (0.16.2) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.1.0) + i18n (1.1.1) concurrent-ruby (~> 1.0) i18n-inflector (2.6.7) i18n (>= 0.4.1) @@ -373,9 +373,9 @@ GEM memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) method_source (0.9.0) - mime-types (3.1) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mime-types-data (3.2018.0812) mini_magick (4.8.0) mini_mime (1.0.1) mini_portile2 (2.3.0) @@ -763,7 +763,7 @@ DEPENDENCIES acts-as-taggable-on (= 5.0.0) acts_as_api (= 1.0.1) addressable (= 2.5.2) - asset_sync (= 2.4.0) + asset_sync (= 2.5.0) autoprefixer-rails (= 8.2.0) bootstrap-sass (= 3.3.7) bootstrap-switch-rails (= 3.3.3) From 1b21d507c9b61d2a185c255b1a4b311a25279a68 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 18:12:02 +0100 Subject: [PATCH 02/54] Bump haml_lint --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 68a29c986..d25433fb3 100644 --- a/Gemfile +++ b/Gemfile @@ -247,7 +247,7 @@ group :development do gem "rb-inotify", "0.9.10", require: false # Linters - gem "haml_lint", "0.27.0", require: false + gem "haml_lint", "0.28.0", require: false gem "pronto", "0.9.5", 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 7e3647cfb..d9781c4a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -276,7 +276,7 @@ GEM haml (5.0.4) temple (>= 0.8.0) tilt - haml_lint (0.27.0) + haml_lint (0.28.0) haml (>= 4.0, < 5.1) rainbow rake (>= 10, < 13) @@ -437,7 +437,7 @@ GEM webfinger (>= 1.0.1) orm_adapter (0.5.0) parallel (1.12.1) - parser (2.5.0.5) + parser (2.5.3.0) ast (~> 2.4.0) pg (1.0.0) phantomjs (2.1.1.0) @@ -445,7 +445,7 @@ GEM capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) - powerpack (0.1.1) + powerpack (0.1.2) pronto (0.9.5) gitlab (~> 4.0, >= 4.0.0) httparty (>= 0.13.7) @@ -616,7 +616,7 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-oembed (0.12.0) - ruby-progressbar (1.9.0) + ruby-progressbar (1.10.0) ruby_dep (1.5.0) rubyzip (1.2.2) rufus-scheduler (3.4.2) @@ -795,7 +795,7 @@ DEPENDENCIES guard-cucumber (= 2.1.2) guard-rspec (= 4.7.3) guard-rubocop (= 1.3.0) - haml_lint (= 0.27.0) + haml_lint (= 0.28.0) hamlit (= 2.8.8) handlebars_assets (= 0.23.2) http_accept_language (= 2.1.1) From a8218a39ed28101141aaabddcca9d172fd1c5711 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 18:17:09 +0100 Subject: [PATCH 03/54] Bump pronto-rubocop --- Gemfile | 2 +- Gemfile.lock | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index d25433fb3..7e36e2ae1 100644 --- a/Gemfile +++ b/Gemfile @@ -251,7 +251,7 @@ group :development do gem "pronto", "0.9.5", 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 + gem "pronto-rubocop", "0.9.1", require: false gem "pronto-scss", "0.9.1", require: false gem "rubocop", "0.54.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index d9781c4a0..b9213aa00 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -243,9 +243,9 @@ GEM ruby-progressbar (~> 1.4) get_process_mem (0.2.1) gherkin (4.1.3) - gitlab (4.3.0) - httparty - terminal-table + gitlab (4.7.0) + httparty (>= 0.14.0) + terminal-table (>= 1.5.1) globalid (0.4.1) activesupport (>= 4.2.0) gon (6.2.0) @@ -303,7 +303,8 @@ GEM http-form_data (2.1.0) http_accept_language (2.1.1) http_parser.rb (0.6.0) - httparty (0.16.2) + httparty (0.16.3) + mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) i18n (1.1.1) @@ -403,7 +404,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - octokit (4.8.0) + octokit (4.13.0) sawyer (~> 0.8.0, >= 0.5.3) omniauth (1.8.1) hashie (>= 3.4.6, < 3.6.0) @@ -459,9 +460,9 @@ GEM pronto-haml (0.9.0) haml_lint (~> 0.23) pronto (~> 0.9.0) - pronto-rubocop (0.9.0) + pronto-rubocop (0.9.1) pronto (~> 0.9.0) - rubocop (~> 0.38, >= 0.35.0) + rubocop (~> 0.50, >= 0.49.1) pronto-scss (0.9.1) pronto (~> 0.9.0) scss_lint (~> 0.43, >= 0.43.0) @@ -621,7 +622,7 @@ GEM rubyzip (1.2.2) rufus-scheduler (3.4.2) et-orbi (~> 1.0) - rugged (0.27.0) + rugged (0.27.5) safe_yaml (1.0.4) sass (3.4.25) sass-rails (5.0.7) @@ -828,7 +829,7 @@ DEPENDENCIES pronto (= 0.9.5) pronto-eslint (= 0.9.1) pronto-haml (= 0.9.0) - pronto-rubocop (= 0.9.0) + pronto-rubocop (= 0.9.1) pronto-scss (= 0.9.1) pry pry-byebug From 4e78d5119578cc89b9e3db09e37f2782cb840676 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 18:19:10 +0100 Subject: [PATCH 04/54] Bump rubocop --- Gemfile | 2 +- Gemfile.lock | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 7e36e2ae1..9ee8bbd54 100644 --- a/Gemfile +++ b/Gemfile @@ -253,7 +253,7 @@ group :development do gem "pronto-haml", "0.9.0", require: false gem "pronto-rubocop", "0.9.1", require: false gem "pronto-scss", "0.9.1", require: false - gem "rubocop", "0.54.0", require: false + gem "rubocop", "0.60.0", require: false # Preloading environment diff --git a/Gemfile.lock b/Gemfile.lock index b9213aa00..ba6760ce0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -316,6 +316,7 @@ GEM i18n-inflector (~> 2.6) railties (>= 3.0.0) ipaddress (0.8.3) + jaro_winkler (1.5.1) jasmine (3.1.0) jasmine-core (= 3.1.0) phantomjs @@ -609,13 +610,14 @@ GEM rspec-mocks (~> 3.7.0) rspec-support (~> 3.7.0) rspec-support (3.7.1) - rubocop (0.54.0) + rubocop (0.60.0) + jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.5) + parser (>= 2.5, != 2.5.1.1) powerpack (~> 0.1) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) + unicode-display_width (~> 1.4.0) ruby-oembed (0.12.0) ruby-progressbar (1.10.0) ruby_dep (1.5.0) @@ -871,7 +873,7 @@ DEPENDENCIES responders (= 2.4.0) rspec-json_expectations (~> 2.1) rspec-rails (= 3.7.2) - rubocop (= 0.54.0) + rubocop (= 0.60.0) ruby-oembed (= 0.12.0) rubyzip (= 1.2.2) sass-rails (= 5.0.7) From 05db801925d3f9a0eabfa1f64a4eebfce3fd9cb3 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 18:22:40 +0100 Subject: [PATCH 05/54] Bump activerecord-import --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 9ee8bbd54..f68716222 100644 --- a/Gemfile +++ b/Gemfile @@ -73,7 +73,7 @@ group :postgresql, optional: true do end -gem "activerecord-import", "0.22.0" +gem "activerecord-import", "0.27.0" # File uploading diff --git a/Gemfile.lock b/Gemfile.lock index ba6760ce0..90823563b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,7 +37,7 @@ GEM activemodel (= 5.1.6) activesupport (= 5.1.6) arel (~> 8.0) - activerecord-import (0.22.0) + activerecord-import (0.27.0) activerecord (>= 3.2) activesupport (5.1.6) concurrent-ruby (~> 1.0, >= 1.0.2) @@ -762,7 +762,7 @@ PLATFORMS DEPENDENCIES active_model_serializers (= 0.9.7) - activerecord-import (= 0.22.0) + activerecord-import (= 0.27.0) acts-as-taggable-on (= 5.0.0) acts_as_api (= 1.0.1) addressable (= 2.5.2) From 126866608bbc242b6e381c812d132c989d06cdcf Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 18:30:55 +0100 Subject: [PATCH 06/54] Bump pry --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 90823563b..9ec783df7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -374,7 +374,7 @@ GEM markerb (1.1.0) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) - method_source (0.9.0) + method_source (0.9.1) mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) @@ -467,7 +467,7 @@ GEM pronto-scss (0.9.1) pronto (~> 0.9.0) scss_lint (~> 0.43, >= 0.43.0) - pry (0.11.3) + pry (0.12.0) coderay (~> 1.1.0) method_source (~> 0.9.0) pry-byebug (3.6.0) From 8ada40ec088ff3883d16f7b5745c31e012abf289 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 18:33:42 +0100 Subject: [PATCH 07/54] Bump simplecov and coveralls --- Gemfile | 4 ++-- Gemfile.lock | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index f68716222..ad3715998 100644 --- a/Gemfile +++ b/Gemfile @@ -266,7 +266,7 @@ group :development do gem "pry-byebug" # test coverage - gem "simplecov", "0.14.1", require: false + gem "simplecov", "0.16.1", require: false gem "turbo_dev_assets", "0.0.2" end @@ -297,7 +297,7 @@ group :test do gem "diaspora_federation-test", "0.2.5" # Coverage - gem "coveralls", "0.8.21", require: false + gem "coveralls", "0.8.22", require: false end group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index 9ec783df7..a781c8759 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -126,9 +126,9 @@ GEM concurrent-ruby (1.1.3) configurate (0.3.1) connection_pool (2.2.1) - coveralls (0.8.21) + coveralls (0.8.22) json (>= 1.8, < 3) - simplecov (~> 0.14.1) + simplecov (~> 0.16.1) term-ansicolor (~> 1.3) thor (~> 0.19.4) tins (~> 1.6) @@ -181,7 +181,7 @@ GEM fabrication (~> 2.16) uuid (~> 2.3, >= 2.3.8) diff-lcs (1.3) - docile (1.1.5) + docile (1.3.1) domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) entypo-rails (3.0.0) @@ -655,8 +655,8 @@ GEM simple_captcha2 (0.4.3) rails (>= 4.1) simple_oauth (0.3.1) - simplecov (0.14.1) - docile (~> 1.1.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) @@ -684,7 +684,7 @@ GEM sysexits (1.2.0) systemu (2.6.5) temple (0.8.0) - term-ansicolor (1.6.0) + term-ansicolor (1.7.0) tins (~> 1.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) @@ -694,7 +694,7 @@ GEM timecop (0.9.1) timers (4.1.2) hitimes - tins (1.16.3) + tins (1.20.2) to_regexp (0.2.1) turbo_dev_assets (0.0.2) twitter (6.2.0) @@ -774,7 +774,7 @@ DEPENDENCIES carrierwave (= 1.2.2) compass-rails (= 3.0.2) configurate (= 0.3.1) - coveralls (= 0.8.21) + coveralls (= 0.8.22) cucumber-api-steps (= 0.14) cucumber-rails (= 1.5.0) database_cleaner (= 1.6.2) @@ -882,7 +882,7 @@ DEPENDENCIES sidekiq (= 5.1.3) sidekiq-cron (= 0.6.3) simple_captcha2 (= 0.4.3) - simplecov (= 0.14.1) + simplecov (= 0.16.1) sinon-rails (= 1.15.0) spring (= 2.0.2) spring-commands-cucumber (= 1.0.1) From 84f3f73f3f508a6e142a0dd9806ef5bac9d3889c Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 18:35:18 +0100 Subject: [PATCH 08/54] Bump fuubar --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index ad3715998..e117fbd7d 100644 --- a/Gemfile +++ b/Gemfile @@ -275,7 +275,7 @@ group :test do # RSpec (unit tests, some integration tests) gem "fixture_builder", "0.5.2.rc3" - gem "fuubar", "2.3.1" + gem "fuubar", "2.3.2" gem "json-schema-rspec", "0.0.4" gem "rspec-json_expectations", "~> 2.1" diff --git a/Gemfile.lock b/Gemfile.lock index a781c8759..1ca309f68 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -238,7 +238,7 @@ GEM fog-core nokogiri (>= 1.5.11, < 2.0.0) formatador (0.2.5) - fuubar (2.3.1) + fuubar (2.3.2) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) get_process_mem (0.2.1) @@ -792,7 +792,7 @@ DEPENDENCIES faraday_middleware (= 0.12.2) fixture_builder (= 0.5.2.rc3) fog-aws (= 2.0.1) - fuubar (= 2.3.1) + fuubar (= 2.3.2) gon (= 6.2.0) guard (= 2.14.2) guard-cucumber (= 2.1.2) From 330b8cd3bab6e68e69e5cbe05b60535b35b34c3f Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 18:41:35 +0100 Subject: [PATCH 09/54] Bump poltergeist --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index e117fbd7d..7d1023912 100644 --- a/Gemfile +++ b/Gemfile @@ -283,7 +283,7 @@ group :test do gem "capybara", "2.18.0" gem "database_cleaner", "1.6.2" - gem "poltergeist", "1.17.0" + gem "poltergeist", "1.18.1" gem "cucumber-api-steps", "0.14", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 1ca309f68..893252443 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -443,8 +443,8 @@ GEM ast (~> 2.4.0) pg (1.0.0) phantomjs (2.1.1.0) - poltergeist (1.17.0) - capybara (~> 2.1) + poltergeist (1.18.1) + capybara (>= 2.1, < 4) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) powerpack (0.1.2) @@ -493,7 +493,7 @@ GEM rack-rewrite (1.5.1) rack-ssl (1.4.1) rack - rack-test (1.0.0) + rack-test (1.1.0) rack (>= 1.0, < 3) rails (5.1.6) actioncable (= 5.1.6) @@ -753,7 +753,7 @@ GEM websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) will_paginate (3.1.6) - xpath (3.0.0) + xpath (3.2.0) nokogiri (~> 1.8) yard (0.9.12) @@ -827,7 +827,7 @@ DEPENDENCIES open_graph_reader (= 0.6.2) openid_connect (= 1.1.6) pg (= 1.0.0) - poltergeist (= 1.17.0) + poltergeist (= 1.18.1) pronto (= 0.9.5) pronto-eslint (= 0.9.1) pronto-haml (= 0.9.0) From 6d4697508913ed37f1be88226a4befd5b9ca4017 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 18:43:08 +0100 Subject: [PATCH 10/54] Bump database_cleaner --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 7d1023912..72d4cf77c 100644 --- a/Gemfile +++ b/Gemfile @@ -282,7 +282,7 @@ group :test do # Cucumber (integration tests) gem "capybara", "2.18.0" - gem "database_cleaner", "1.6.2" + gem "database_cleaner", "1.7.0" gem "poltergeist", "1.18.1" gem "cucumber-api-steps", "0.14", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 893252443..c49217ade 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -155,7 +155,7 @@ GEM nokogiri (~> 1.5) railties (>= 4, < 5.2) cucumber-wire (0.0.1) - database_cleaner (1.6.2) + database_cleaner (1.7.0) devise (4.4.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -777,7 +777,7 @@ DEPENDENCIES coveralls (= 0.8.22) cucumber-api-steps (= 0.14) cucumber-rails (= 1.5.0) - database_cleaner (= 1.6.2) + database_cleaner (= 1.7.0) devise (= 4.4.3) devise_lastseenable (= 0.0.6) diaspora-prosody-config (= 0.0.7) From e48571d6edd87572a208b88ce2cfbf85646d54ce Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 18:50:19 +0100 Subject: [PATCH 11/54] Bump webmock --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 72d4cf77c..2a06170da 100644 --- a/Gemfile +++ b/Gemfile @@ -292,7 +292,7 @@ group :test do gem "factory_girl_rails", "4.8.0" gem "shoulda-matchers", "3.1.2" gem "timecop", "0.9.1" - gem "webmock", "3.3.0", require: false + gem "webmock", "3.4.2", require: false gem "diaspora_federation-test", "0.2.5" diff --git a/Gemfile.lock b/Gemfile.lock index c49217ade..b5aafe7de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -745,7 +745,7 @@ GEM webfinger (1.1.0) activesupport httpclient (>= 2.4) - webmock (3.3.0) + webmock (3.4.2) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -899,7 +899,7 @@ DEPENDENCIES unicorn-worker-killer (= 0.4.4) uuid (= 2.3.8) versionist (= 1.7.0) - webmock (= 3.3.0) + webmock (= 3.4.2) will_paginate (= 3.1.6) BUNDLED WITH From d2cffe9d53b635051f0726d07098530a89a0ef98 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 18:53:43 +0100 Subject: [PATCH 12/54] Bump rspec and rspec-rails --- Gemfile | 2 +- Gemfile.lock | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Gemfile b/Gemfile index 2a06170da..6f0d5e300 100644 --- a/Gemfile +++ b/Gemfile @@ -302,7 +302,7 @@ end group :development, :test do # RSpec (unit tests, some integration tests) - gem "rspec-rails", "3.7.2" + gem "rspec-rails", "3.8.1" # Cucumber (integration tests) gem "cucumber-rails", "1.5.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index b5aafe7de..1781ea141 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -134,7 +134,7 @@ GEM tins (~> 1.6) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.3) + crass (1.0.4) cucumber (2.99.0) builder (>= 2.1.2) cucumber-core (~> 1.5.0) @@ -362,7 +362,7 @@ GEM multi_json (~> 1.10) logging-rails (0.6.0) logging (>= 1.8) - loofah (2.2.2) + loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.13) @@ -588,28 +588,28 @@ GEM responders (2.4.0) actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) - rspec (3.7.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-core (3.7.1) - rspec-support (~> 3.7.0) - rspec-expectations (3.7.0) + rspec (3.8.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) + rspec-support (~> 3.8.0) rspec-json_expectations (2.1.0) - rspec-mocks (3.7.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-rails (3.7.2) + rspec-support (~> 3.8.0) + rspec-rails (3.8.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-support (~> 3.7.0) - rspec-support (3.7.1) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) rubocop (0.60.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -872,7 +872,7 @@ DEPENDENCIES redis (= 3.3.5) responders (= 2.4.0) rspec-json_expectations (~> 2.1) - rspec-rails (= 3.7.2) + rspec-rails (= 3.8.1) rubocop (= 0.60.0) ruby-oembed (= 0.12.0) rubyzip (= 1.2.2) From 0b676452d052e76738bc854918e83fea613792d6 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 18:55:05 +0100 Subject: [PATCH 13/54] Bump jasmine --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 6f0d5e300..9051ddd8a 100644 --- a/Gemfile +++ b/Gemfile @@ -308,7 +308,7 @@ group :development, :test do gem "cucumber-rails", "1.5.0", require: false # Jasmine (client side application tests (JS)) - gem "jasmine", "3.1.0" + gem "jasmine", "3.3.0" gem "jasmine-jquery-rails", "2.0.3" gem "rails-assets-jasmine-ajax", "3.3.1", source: "https://rails-assets.org" gem "sinon-rails", "1.15.0" diff --git a/Gemfile.lock b/Gemfile.lock index 1781ea141..88b249d29 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -317,12 +317,12 @@ GEM railties (>= 3.0.0) ipaddress (0.8.3) jaro_winkler (1.5.1) - jasmine (3.1.0) - jasmine-core (= 3.1.0) + jasmine (3.3.0) + jasmine-core (~> 3.3.0) phantomjs rack (>= 1.2.1) rake - jasmine-core (3.1.0) + jasmine-core (3.3.0) jasmine-jquery-rails (2.0.3) jquery-rails (4.3.1) rails-dom-testing (>= 1, < 3) @@ -803,7 +803,7 @@ DEPENDENCIES handlebars_assets (= 0.23.2) http_accept_language (= 2.1.1) i18n-inflector-rails (= 1.0.7) - jasmine (= 3.1.0) + jasmine (= 3.3.0) jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.3.1) js-routes (= 1.4.3) From c9588442a60fe435dcedd2666f1e6446a487c4fb Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 18:55:51 +0100 Subject: [PATCH 14/54] Bump rails-assets-jasmine-ajax --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 9051ddd8a..6c9e47f33 100644 --- a/Gemfile +++ b/Gemfile @@ -310,7 +310,7 @@ group :development, :test do # Jasmine (client side application tests (JS)) gem "jasmine", "3.3.0" gem "jasmine-jquery-rails", "2.0.3" - gem "rails-assets-jasmine-ajax", "3.3.1", source: "https://rails-assets.org" + gem "rails-assets-jasmine-ajax", "3.4.0", source: "https://rails-assets.org" gem "sinon-rails", "1.15.0" # For `assigns` in controller specs diff --git a/Gemfile.lock b/Gemfile.lock index 88b249d29..28b778175 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -528,9 +528,9 @@ GEM rails-assets-favico.js (0.3.10) rails-assets-fine-uploader (5.13.0) rails-assets-highlightjs (9.12.0) - rails-assets-jasmine (2.99.2) - rails-assets-jasmine-ajax (3.3.1) - rails-assets-jasmine (~> 2) + rails-assets-jasmine (3.3.0) + rails-assets-jasmine-ajax (3.4.0) + rails-assets-jasmine (~> 3) rails-assets-jquery (3.2.1) rails-assets-jquery-colorbox (1.6.4) rails-assets-jquery (>= 1.3.2) @@ -849,7 +849,7 @@ DEPENDENCIES rails-assets-diaspora_jsxc (= 0.1.5.develop.7)! rails-assets-fine-uploader (= 5.13.0)! rails-assets-highlightjs (= 9.12.0)! - rails-assets-jasmine-ajax (= 3.3.1)! + rails-assets-jasmine-ajax (= 3.4.0)! rails-assets-jquery (= 3.2.1)! rails-assets-jquery-placeholder (= 2.3.1)! rails-assets-jquery-textchange (= 0.2.3)! From a55684c751adc1a77b40f20b6d90c1e864be8911 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 19:01:56 +0100 Subject: [PATCH 15/54] Bump unicorn --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 6c9e47f33..08cf4461f 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ gem "responders", "2.4.0" # Appserver -gem "unicorn", "5.4.0", require: false +gem "unicorn", "5.4.1", require: false gem "unicorn-worker-killer", "0.4.4" # Federation diff --git a/Gemfile.lock b/Gemfile.lock index 28b778175..a6ad08a28 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -720,7 +720,7 @@ GEM unf_ext unf_ext (0.0.7.5) unicode-display_width (1.4.0) - unicorn (5.4.0) + unicorn (5.4.1) kgio (~> 2.6) raindrops (~> 0.7) unicorn-worker-killer (0.4.4) @@ -895,7 +895,7 @@ DEPENDENCIES twitter-text (= 1.14.7) typhoeus (= 1.3.0) uglifier (= 4.1.8) - unicorn (= 5.4.0) + unicorn (= 5.4.1) unicorn-worker-killer (= 0.4.4) uuid (= 2.3.8) versionist (= 1.7.0) From a2e326b27dfbf8c5ee5a614af32e258436365c7e Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 19:03:12 +0100 Subject: [PATCH 16/54] Bump json-schema --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 08cf4461f..6452d5f28 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,7 @@ gem "diaspora_federation-rails", "0.2.5" gem "acts_as_api", "1.0.1" gem "json", "2.1.0" -gem "json-schema", "2.8.0" +gem "json-schema", "2.8.1" # Authentication diff --git a/Gemfile.lock b/Gemfile.lock index a6ad08a28..ff64b9bc1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -339,7 +339,7 @@ GEM activesupport aes_key_wrap bindata - json-schema (2.8.0) + json-schema (2.8.1) addressable (>= 2.4) json-schema-rspec (0.0.4) json-schema (~> 2.5) @@ -809,7 +809,7 @@ DEPENDENCIES js-routes (= 1.4.3) js_image_paths (= 0.1.1) json (= 2.1.0) - json-schema (= 2.8.0) + json-schema (= 2.8.1) json-schema-rspec (= 0.0.4) leaflet-rails (= 1.3.1) logging-rails (= 0.6.0) From 01db49ef26759f0bfaf59da62b36af8da1b28ae4 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 19:07:33 +0100 Subject: [PATCH 17/54] Bump devise --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 6452d5f28..5679b5672 100644 --- a/Gemfile +++ b/Gemfile @@ -26,7 +26,7 @@ gem "json-schema", "2.8.1" # Authentication -gem "devise", "4.4.3" +gem "devise", "4.5.0" gem "devise_lastseenable", "0.0.6" # Captcha diff --git a/Gemfile.lock b/Gemfile.lock index ff64b9bc1..90e19ad4c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -63,7 +63,7 @@ GEM attr_required (1.0.1) autoprefixer-rails (8.2.0) execjs - bcrypt (3.1.11) + bcrypt (3.1.12) bindata (2.4.3) bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) @@ -156,7 +156,7 @@ GEM railties (>= 4, < 5.2) cucumber-wire (0.0.1) database_cleaner (1.7.0) - devise (4.4.3) + devise (4.5.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 6.0) @@ -778,7 +778,7 @@ DEPENDENCIES cucumber-api-steps (= 0.14) cucumber-rails (= 1.5.0) database_cleaner (= 1.7.0) - devise (= 4.4.3) + devise (= 4.5.0) devise_lastseenable (= 0.0.6) diaspora-prosody-config (= 0.0.7) diaspora_federation-json_schema (= 0.2.5) From 3dbc0fc63270b80c2111a8a789ae3c77eee6d33d Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 19:12:09 +0100 Subject: [PATCH 18/54] Bump sidekiq --- Gemfile | 2 +- Gemfile.lock | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 5679b5672..7ae664cc7 100644 --- a/Gemfile +++ b/Gemfile @@ -36,7 +36,7 @@ gem "simple_captcha2", "0.4.3", require: "simple_captcha" # Background processing gem "redis", "3.3.5" # Pinned to 3.3.x because of https://github.com/antirez/redis/issues/4272 -gem "sidekiq", "5.1.3" +gem "sidekiq", "5.2.3" # Scheduled processing diff --git a/Gemfile.lock b/Gemfile.lock index 90e19ad4c..782614e52 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -125,7 +125,7 @@ GEM sprockets (< 4.0) concurrent-ruby (1.1.3) configurate (0.3.1) - connection_pool (2.2.1) + connection_pool (2.2.2) coveralls (0.8.22) json (>= 1.8, < 3) simplecov (~> 0.16.1) @@ -488,7 +488,7 @@ GEM json-jwt (>= 1.9.0) rack rack-piwik (0.3.0) - rack-protection (2.0.1) + rack-protection (2.0.4) rack rack-rewrite (1.5.1) rack-ssl (1.4.1) @@ -644,9 +644,8 @@ GEM shellany (0.0.1) shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.1.3) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) + sidekiq (5.2.3) + connection_pool (~> 2.2, >= 2.2.2) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) sidekiq-cron (0.6.3) @@ -879,7 +878,7 @@ DEPENDENCIES sass-rails (= 5.0.7) secure_headers (= 5.0.5) shoulda-matchers (= 3.1.2) - sidekiq (= 5.1.3) + sidekiq (= 5.2.3) sidekiq-cron (= 0.6.3) simple_captcha2 (= 0.4.3) simplecov (= 0.16.1) From 8ee15ebc1301dc77360898b8e7c18e7b315b4359 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 19:13:09 +0100 Subject: [PATCH 19/54] Bump sidekiq-cron --- Gemfile | 2 +- Gemfile.lock | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 7ae664cc7..85d3cc181 100644 --- a/Gemfile +++ b/Gemfile @@ -40,7 +40,7 @@ gem "sidekiq", "5.2.3" # Scheduled processing -gem "sidekiq-cron", "0.6.3" +gem "sidekiq-cron", "1.0.4" # Compression diff --git a/Gemfile.lock b/Gemfile.lock index 782614e52..aa13890b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -192,7 +192,7 @@ GEM execjs multi_json (>= 1.3) rake - et-orbi (1.1.0) + et-orbi (1.1.6) tzinfo ethon (0.11.0) ffi (>= 1.3.0) @@ -238,6 +238,9 @@ GEM fog-core nokogiri (>= 1.5.11, < 2.0.0) formatador (0.2.5) + fugit (1.1.6) + et-orbi (~> 1.1, >= 1.1.6) + raabro (~> 1.1) fuubar (2.3.2) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) @@ -474,6 +477,7 @@ GEM byebug (~> 10.0) pry (~> 0.10) public_suffix (3.0.3) + raabro (1.1.6) rack (2.0.6) rack-cors (1.0.2) rack-google-analytics (1.2.0) @@ -622,8 +626,6 @@ GEM ruby-progressbar (1.10.0) ruby_dep (1.5.0) rubyzip (1.2.2) - rufus-scheduler (3.4.2) - et-orbi (~> 1.0) rugged (0.27.5) safe_yaml (1.0.4) sass (3.4.25) @@ -648,8 +650,8 @@ GEM connection_pool (~> 2.2, >= 2.2.2) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) - sidekiq-cron (0.6.3) - rufus-scheduler (>= 3.3.0) + sidekiq-cron (1.0.4) + fugit (~> 1.1) sidekiq (>= 4.2.1) simple_captcha2 (0.4.3) rails (>= 4.1) @@ -879,7 +881,7 @@ DEPENDENCIES secure_headers (= 5.0.5) shoulda-matchers (= 3.1.2) sidekiq (= 5.2.3) - sidekiq-cron (= 0.6.3) + sidekiq-cron (= 1.0.4) simple_captcha2 (= 0.4.3) simplecov (= 0.16.1) sinon-rails (= 1.15.0) From 06c953a4001cef83cd17233c9ec636d838e6f50f Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 19:16:38 +0100 Subject: [PATCH 20/54] Bump uglifier --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 85d3cc181..60525d7cf 100644 --- a/Gemfile +++ b/Gemfile @@ -44,7 +44,7 @@ gem "sidekiq-cron", "1.0.4" # Compression -gem "uglifier", "4.1.8" +gem "uglifier", "4.1.19" # Configuration diff --git a/Gemfile.lock b/Gemfile.lock index aa13890b3..2fd1f437e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -715,7 +715,7 @@ GEM ethon (>= 0.9.0) tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.8) + uglifier (4.1.19) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext @@ -895,7 +895,7 @@ DEPENDENCIES twitter (= 6.2.0) twitter-text (= 1.14.7) typhoeus (= 1.3.0) - uglifier (= 4.1.8) + uglifier (= 4.1.19) unicorn (= 5.4.1) unicorn-worker-killer (= 0.4.4) uuid (= 2.3.8) From 01f426e739ae0cccc4a556ddb99e85f4325ddd91 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 19:21:58 +0100 Subject: [PATCH 21/54] Bump autoprefixer-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 60525d7cf..4e13b7c17 100644 --- a/Gemfile +++ b/Gemfile @@ -56,7 +56,7 @@ gem "rack-cors", "1.0.2", require: "rack/cors" # CSS -gem "autoprefixer-rails", "8.2.0" +gem "autoprefixer-rails", "8.6.5" gem "bootstrap-sass", "3.3.7" gem "bootstrap-switch-rails", "3.3.3" gem "compass-rails", "3.0.2" diff --git a/Gemfile.lock b/Gemfile.lock index 2fd1f437e..ad7bf6829 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -61,7 +61,7 @@ GEM unf ast (2.4.0) attr_required (1.0.1) - autoprefixer-rails (8.2.0) + autoprefixer-rails (8.6.5) execjs bcrypt (3.1.12) bindata (2.4.3) @@ -768,7 +768,7 @@ DEPENDENCIES acts_as_api (= 1.0.1) addressable (= 2.5.2) asset_sync (= 2.5.0) - autoprefixer-rails (= 8.2.0) + autoprefixer-rails (= 8.6.5) bootstrap-sass (= 3.3.7) bootstrap-switch-rails (= 3.3.3) capybara (= 2.18.0) From 5205e3c5266aaa006340c668a1cc1a2c79499a2d Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 19:24:24 +0100 Subject: [PATCH 22/54] Bump bootstrap-switch-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 4e13b7c17..b889c1e89 100644 --- a/Gemfile +++ b/Gemfile @@ -58,7 +58,7 @@ gem "rack-cors", "1.0.2", require: "rack/cors" gem "autoprefixer-rails", "8.6.5" gem "bootstrap-sass", "3.3.7" -gem "bootstrap-switch-rails", "3.3.3" +gem "bootstrap-switch-rails", "3.3.4" gem "compass-rails", "3.0.2" gem "sass-rails", "5.0.7" gem "sprockets-rails", "3.2.1" diff --git a/Gemfile.lock b/Gemfile.lock index ad7bf6829..0833e8199 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -68,7 +68,7 @@ GEM bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) - bootstrap-switch-rails (3.3.3) + bootstrap-switch-rails (3.3.4) buftok (0.2.0) builder (3.2.3) byebug (10.0.2) @@ -770,7 +770,7 @@ DEPENDENCIES asset_sync (= 2.5.0) autoprefixer-rails (= 8.6.5) bootstrap-sass (= 3.3.7) - bootstrap-switch-rails (= 3.3.3) + bootstrap-switch-rails (= 3.3.4) capybara (= 2.18.0) carrierwave (= 1.2.2) compass-rails (= 3.0.2) From e6375505bcfbed3956ef9e9762698cab64650824 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 19:27:38 +0100 Subject: [PATCH 23/54] Bump compass-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index b889c1e89..8b44da3d9 100644 --- a/Gemfile +++ b/Gemfile @@ -59,7 +59,7 @@ gem "rack-cors", "1.0.2", require: "rack/cors" gem "autoprefixer-rails", "8.6.5" gem "bootstrap-sass", "3.3.7" gem "bootstrap-switch-rails", "3.3.4" -gem "compass-rails", "3.0.2" +gem "compass-rails", "3.1.0" gem "sass-rails", "5.0.7" gem "sprockets-rails", "3.2.1" diff --git a/Gemfile.lock b/Gemfile.lock index 0833e8199..5da7e4de5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -119,7 +119,7 @@ GEM sass (>= 3.3.0, < 3.5) compass-import-once (1.0.5) sass (>= 3.2, < 3.5) - compass-rails (3.0.2) + compass-rails (3.1.0) compass (~> 1.0.0) sass-rails (< 5.1) sprockets (< 4.0) @@ -773,7 +773,7 @@ DEPENDENCIES bootstrap-switch-rails (= 3.3.4) capybara (= 2.18.0) carrierwave (= 1.2.2) - compass-rails (= 3.0.2) + compass-rails (= 3.1.0) configurate (= 0.3.1) coveralls (= 0.8.22) cucumber-api-steps (= 0.14) From ad725c5649945f562dc36c09ce0799608ebbbd9d Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 19:30:18 +0100 Subject: [PATCH 24/54] Bump mysql2 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 8b44da3d9..7a3d8ccf9 100644 --- a/Gemfile +++ b/Gemfile @@ -66,7 +66,7 @@ gem "sprockets-rails", "3.2.1" # Database group :mysql, optional: true do - gem "mysql2", "0.5.0" + gem "mysql2", "0.5.2" end group :postgresql, optional: true do gem "pg", "1.0.0" diff --git a/Gemfile.lock b/Gemfile.lock index 5da7e4de5..dbe9dd9b4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -392,7 +392,7 @@ GEM multi_test (0.1.2) multi_xml (0.6.0) multipart-post (2.0.0) - mysql2 (0.5.0) + mysql2 (0.5.2) naught (1.1.0) nenv (0.3.0) nio4r (2.3.0) @@ -819,7 +819,7 @@ DEPENDENCIES mini_magick (= 4.8.0) minitest mobile-fu (= 1.4.0) - mysql2 (= 0.5.0) + mysql2 (= 0.5.2) nokogiri (= 1.8.5) omniauth (= 1.8.1) omniauth-tumblr (= 1.2) From 4c8acb5a07f149ef9c47d2303f9e8aec31c13adb Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 19:32:17 +0100 Subject: [PATCH 25/54] Bump pg --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 7a3d8ccf9..15fbc2ab9 100644 --- a/Gemfile +++ b/Gemfile @@ -69,7 +69,7 @@ group :mysql, optional: true do gem "mysql2", "0.5.2" end group :postgresql, optional: true do - gem "pg", "1.0.0" + gem "pg", "1.1.3" end diff --git a/Gemfile.lock b/Gemfile.lock index dbe9dd9b4..f950654dd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -444,7 +444,7 @@ GEM parallel (1.12.1) parser (2.5.3.0) ast (~> 2.4.0) - pg (1.0.0) + pg (1.1.3) phantomjs (2.1.1.0) poltergeist (1.18.1) capybara (>= 2.1, < 4) @@ -827,7 +827,7 @@ DEPENDENCIES omniauth-wordpress (= 0.2.2) open_graph_reader (= 0.6.2) openid_connect (= 1.1.6) - pg (= 1.0.0) + pg (= 1.1.3) poltergeist (= 1.18.1) pronto (= 0.9.5) pronto-eslint (= 0.9.1) From f8b5b99c5cdac118ff5baa310cb2e101d4bb6280 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 19:33:34 +0100 Subject: [PATCH 26/54] Bump carrierwave --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 15fbc2ab9..691f9b9e1 100644 --- a/Gemfile +++ b/Gemfile @@ -77,7 +77,7 @@ gem "activerecord-import", "0.27.0" # File uploading -gem "carrierwave", "1.2.2" +gem "carrierwave", "1.2.3" gem "fog-aws", "2.0.1" gem "mini_magick", "4.8.0" diff --git a/Gemfile.lock b/Gemfile.lock index f950654dd..0414a5a44 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,7 +79,7 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (>= 2.0, < 4.0) - carrierwave (1.2.2) + carrierwave (1.2.3) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) @@ -772,7 +772,7 @@ DEPENDENCIES bootstrap-sass (= 3.3.7) bootstrap-switch-rails (= 3.3.4) capybara (= 2.18.0) - carrierwave (= 1.2.2) + carrierwave (= 1.2.3) compass-rails (= 3.1.0) configurate (= 0.3.1) coveralls (= 0.8.22) From cd3b4548535cac8c4452acc83e3c649bae191f3c Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 19:39:51 +0100 Subject: [PATCH 27/54] Bump fog-aws --- Gemfile | 2 +- Gemfile.lock | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 691f9b9e1..dfc7e4b9b 100644 --- a/Gemfile +++ b/Gemfile @@ -78,7 +78,7 @@ gem "activerecord-import", "0.27.0" # File uploading gem "carrierwave", "1.2.3" -gem "fog-aws", "2.0.1" +gem "fog-aws", "3.3.0" gem "mini_magick", "4.8.0" # GUID generation diff --git a/Gemfile.lock b/Gemfile.lock index 0414a5a44..0449776e9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -222,17 +222,18 @@ GEM activerecord (>= 2) activesupport (>= 2) hashdiff - fog-aws (2.0.1) - fog-core (~> 1.38) - fog-json (~> 1.0) + fog-aws (3.3.0) + fog-core (~> 2.1) + fog-json (~> 1.1) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (1.45.0) + fog-core (2.1.2) builder excon (~> 0.58) formatador (~> 0.2) - fog-json (1.0.2) - fog-core (~> 1.0) + mime-types + fog-json (1.2.0) + fog-core multi_json (~> 1.10) fog-xml (0.1.3) fog-core @@ -792,7 +793,7 @@ DEPENDENCIES faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.12.2) fixture_builder (= 0.5.2.rc3) - fog-aws (= 2.0.1) + fog-aws (= 3.3.0) fuubar (= 2.3.2) gon (= 6.2.0) guard (= 2.14.2) From 464854443fa9dbd4fa150218534e8a3564330b44 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 19:41:07 +0100 Subject: [PATCH 28/54] Bump mini_magick --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index dfc7e4b9b..ebdfbcf6c 100644 --- a/Gemfile +++ b/Gemfile @@ -79,7 +79,7 @@ gem "activerecord-import", "0.27.0" gem "carrierwave", "1.2.3" gem "fog-aws", "3.3.0" -gem "mini_magick", "4.8.0" +gem "mini_magick", "4.9.2" # GUID generation gem "uuid", "2.3.8" diff --git a/Gemfile.lock b/Gemfile.lock index 0449776e9..10bb03767 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -382,7 +382,7 @@ GEM mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) - mini_magick (4.8.0) + mini_magick (4.9.2) mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.11.3) @@ -817,7 +817,7 @@ DEPENDENCIES logging-rails (= 0.6.0) markdown-it-html5-embed (= 1.0.0) markerb (= 1.1.0) - mini_magick (= 4.8.0) + mini_magick (= 4.9.2) minitest mobile-fu (= 1.4.0) mysql2 (= 0.5.2) From 092ff0b5502210f2e07d68a35c6e353ee8c4eb0e Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 19:42:31 +0100 Subject: [PATCH 29/54] Bump uuid --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index ebdfbcf6c..552a35e79 100644 --- a/Gemfile +++ b/Gemfile @@ -82,7 +82,7 @@ gem "fog-aws", "3.3.0" gem "mini_magick", "4.9.2" # GUID generation -gem "uuid", "2.3.8" +gem "uuid", "2.3.9" # Icons diff --git a/Gemfile.lock b/Gemfile.lock index 10bb03767..01572a312 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -729,7 +729,7 @@ GEM get_process_mem (~> 0) unicorn (>= 4, < 6) useragent (0.16.10) - uuid (2.3.8) + uuid (2.3.9) macaddr (~> 1.0) valid (1.2.0) validate_email (0.1.6) @@ -899,7 +899,7 @@ DEPENDENCIES uglifier (= 4.1.19) unicorn (= 5.4.1) unicorn-worker-killer (= 0.4.4) - uuid (= 2.3.8) + uuid (= 2.3.9) versionist (= 1.7.0) webmock (= 3.4.2) will_paginate (= 3.1.6) From e87b751107dc2bc162f33aa23d858cf4970e5b85 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 19:45:06 +0100 Subject: [PATCH 30/54] Bump jquery-rails and rails-assets-jquery --- Gemfile | 4 ++-- Gemfile.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 552a35e79..599c3d32a 100644 --- a/Gemfile +++ b/Gemfile @@ -91,12 +91,12 @@ gem "entypo-rails", "3.0.0" # JavaScript gem "handlebars_assets", "0.23.2" -gem "jquery-rails", "4.3.1" +gem "jquery-rails", "4.3.3" gem "js-routes", "1.4.3" gem "js_image_paths", "0.1.1" 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", "3.3.1" # Should be kept in sync with jquery-rails gem "rails-assets-jquery.ui", "1.11.4" gem "rails-assets-highlightjs", "9.12.0" diff --git a/Gemfile.lock b/Gemfile.lock index 01572a312..5bb41ee01 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -328,7 +328,7 @@ GEM rake jasmine-core (3.3.0) jasmine-jquery-rails (2.0.3) - jquery-rails (4.3.1) + jquery-rails (4.3.3) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -536,7 +536,7 @@ GEM rails-assets-jasmine (3.3.0) rails-assets-jasmine-ajax (3.4.0) rails-assets-jasmine (~> 3) - rails-assets-jquery (3.2.1) + rails-assets-jquery (3.3.1) rails-assets-jquery-colorbox (1.6.4) rails-assets-jquery (>= 1.3.2) rails-assets-jquery-fullscreen-plugin (0.5.0) @@ -807,7 +807,7 @@ DEPENDENCIES i18n-inflector-rails (= 1.0.7) jasmine (= 3.3.0) jasmine-jquery-rails (= 2.0.3) - jquery-rails (= 4.3.1) + jquery-rails (= 4.3.3) js-routes (= 1.4.3) js_image_paths (= 0.1.1) json (= 2.1.0) @@ -852,7 +852,7 @@ DEPENDENCIES rails-assets-fine-uploader (= 5.13.0)! rails-assets-highlightjs (= 9.12.0)! rails-assets-jasmine-ajax (= 3.4.0)! - rails-assets-jquery (= 3.2.1)! + rails-assets-jquery (= 3.3.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 67b825233d44c34526f30a4469f258d4fb07af18 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 19:47:01 +0100 Subject: [PATCH 31/54] Bump js-routes --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 599c3d32a..ffc816734 100644 --- a/Gemfile +++ b/Gemfile @@ -92,7 +92,7 @@ gem "entypo-rails", "3.0.0" gem "handlebars_assets", "0.23.2" gem "jquery-rails", "4.3.3" -gem "js-routes", "1.4.3" +gem "js-routes", "1.4.4" gem "js_image_paths", "0.1.1" source "https://rails-assets.org" do diff --git a/Gemfile.lock b/Gemfile.lock index 5bb41ee01..d3212675e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -332,7 +332,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - js-routes (1.4.3) + js-routes (1.4.4) railties (>= 3.2) sprockets-rails js_image_paths (0.1.1) @@ -808,7 +808,7 @@ DEPENDENCIES jasmine (= 3.3.0) jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.3.3) - js-routes (= 1.4.3) + js-routes (= 1.4.4) js_image_paths (= 0.1.1) json (= 2.1.0) json-schema (= 2.8.1) From 382eda2966a1b98e58b065efd63e253b4e4ed2ba Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 19:51:38 +0100 Subject: [PATCH 32/54] Bump rails-assets-markdown-it --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index ffc816734..11ae561cd 100644 --- a/Gemfile +++ b/Gemfile @@ -100,7 +100,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.4.1" + gem "rails-assets-markdown-it", "8.4.2" 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 d3212675e..293da44a5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -550,7 +550,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.4.1) + rails-assets-markdown-it (8.4.2) 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) @@ -857,7 +857,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.4.1)! + rails-assets-markdown-it (= 8.4.2)! 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 efa69a23f4d20ce2b0ff882c682417bef91a1e29 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 19:52:40 +0100 Subject: [PATCH 33/54] Bump rails-assets-autosize --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 11ae561cd..9c7970ed5 100644 --- a/Gemfile +++ b/Gemfile @@ -115,7 +115,7 @@ source "https://rails-assets.org" do # jQuery plugins - gem "rails-assets-autosize", "4.0.1" + gem "rails-assets-autosize", "4.0.2" gem "rails-assets-blueimp-gallery", "2.33.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 293da44a5..388dc7768 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -512,7 +512,7 @@ GEM bundler (>= 1.3.0) railties (= 5.1.6) sprockets-rails (>= 2.0.0) - rails-assets-autosize (4.0.1) + rails-assets-autosize (4.0.2) rails-assets-backbone (1.3.3) rails-assets-underscore (>= 1.8.3) rails-assets-blueimp-gallery (2.33.0) @@ -843,7 +843,7 @@ DEPENDENCIES rack-rewrite (= 1.5.1) rack-ssl (= 1.4.1) rails (= 5.1.6) - rails-assets-autosize (= 4.0.1)! + rails-assets-autosize (= 4.0.2)! rails-assets-backbone (= 1.3.3)! rails-assets-blueimp-gallery (= 2.33.0)! rails-assets-bootstrap-markdown (= 2.10.0)! From eea609a2281d972b49c12b38999a7170ab9a843e Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 19:54:50 +0100 Subject: [PATCH 34/54] Bump rails-assets-utatti-perfect-scrollbar --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 9c7970ed5..9b8a704da 100644 --- a/Gemfile +++ b/Gemfile @@ -120,7 +120,7 @@ source "https://rails-assets.org" do 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" - gem "rails-assets-utatti-perfect-scrollbar", "1.3.0" + gem "rails-assets-utatti-perfect-scrollbar", "1.4.0" end gem "markdown-it-html5-embed", "1.0.0" diff --git a/Gemfile.lock b/Gemfile.lock index 388dc7768..989f59814 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -557,7 +557,7 @@ GEM rails-assets-markdown-it-sub (1.0.0) rails-assets-markdown-it-sup (1.0.0) rails-assets-underscore (1.8.3) - rails-assets-utatti-perfect-scrollbar (1.3.0) + rails-assets-utatti-perfect-scrollbar (1.4.0) rails-controller-testing (1.0.2) actionpack (~> 5.x, >= 5.0.1) actionview (~> 5.x, >= 5.0.1) @@ -864,7 +864,7 @@ DEPENDENCIES rails-assets-markdown-it-sanitizer (= 0.4.3)! rails-assets-markdown-it-sub (= 1.0.0)! rails-assets-markdown-it-sup (= 1.0.0)! - rails-assets-utatti-perfect-scrollbar (= 1.3.0)! + rails-assets-utatti-perfect-scrollbar (= 1.4.0)! rails-controller-testing (= 1.0.2) rails-i18n (= 5.1.1) rails-timeago (= 2.16.0) From f0eead3659e8f46275bd1376f5f1f45b66f8696d Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 19:57:53 +0100 Subject: [PATCH 35/54] Bump rails-i18n --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 9b8a704da..0b9d54c6e 100644 --- a/Gemfile +++ b/Gemfile @@ -129,7 +129,7 @@ gem "markdown-it-html5-embed", "1.0.0" gem "http_accept_language", "2.1.1" gem "i18n-inflector-rails", "1.0.7" -gem "rails-i18n", "5.1.1" +gem "rails-i18n", "5.1.2" # Mail diff --git a/Gemfile.lock b/Gemfile.lock index 989f59814..0ad3a12c3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -556,7 +556,7 @@ GEM rails-assets-markdown-it-sanitizer (0.4.3) rails-assets-markdown-it-sub (1.0.0) rails-assets-markdown-it-sup (1.0.0) - rails-assets-underscore (1.8.3) + rails-assets-underscore (1.9.1) rails-assets-utatti-perfect-scrollbar (1.4.0) rails-controller-testing (1.0.2) actionpack (~> 5.x, >= 5.0.1) @@ -567,7 +567,7 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - rails-i18n (5.1.1) + rails-i18n (5.1.2) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) rails-timeago (2.16.0) @@ -866,7 +866,7 @@ DEPENDENCIES rails-assets-markdown-it-sup (= 1.0.0)! rails-assets-utatti-perfect-scrollbar (= 1.4.0)! rails-controller-testing (= 1.0.2) - rails-i18n (= 5.1.1) + rails-i18n (= 5.1.2) rails-timeago (= 2.16.0) rb-fsevent (= 0.10.3) rb-inotify (= 0.9.10) From d8016d39cf8d0bae83569c31f3a6efe67b576d42 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 20:06:39 +0100 Subject: [PATCH 36/54] Bump secure_headers --- Gemfile | 2 +- Gemfile.lock | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 0b9d54c6e..69f0d4880 100644 --- a/Gemfile +++ b/Gemfile @@ -152,7 +152,7 @@ gem "string-direction", "1.2.1" # Security Headers -gem "secure_headers", "5.0.5" +gem "secure_headers", "6.0.0" # Services diff --git a/Gemfile.lock b/Gemfile.lock index 0ad3a12c3..427d8353c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -642,8 +642,7 @@ GEM scss_lint (0.55.0) rake (>= 0.9, < 13) sass (~> 3.4.20) - secure_headers (5.0.5) - useragent (>= 0.15.0) + secure_headers (6.0.0) shellany (0.0.1) shoulda-matchers (3.1.2) activesupport (>= 4.0.0) @@ -728,7 +727,6 @@ GEM unicorn-worker-killer (0.4.4) get_process_mem (~> 0) unicorn (>= 4, < 6) - useragent (0.16.10) uuid (2.3.9) macaddr (~> 1.0) valid (1.2.0) @@ -879,7 +877,7 @@ DEPENDENCIES ruby-oembed (= 0.12.0) rubyzip (= 1.2.2) sass-rails (= 5.0.7) - secure_headers (= 5.0.5) + secure_headers (= 6.0.0) shoulda-matchers (= 3.1.2) sidekiq (= 5.2.3) sidekiq-cron (= 1.0.4) From 98d165c0c5c600c0e4718d47737c35ceb810edbe Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 20:12:32 +0100 Subject: [PATCH 37/54] Bump acts-as-taggable-on --- Gemfile | 2 +- Gemfile.lock | 6 +++--- app/models/profile.rb | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 69f0d4880..7ec378043 100644 --- a/Gemfile +++ b/Gemfile @@ -175,7 +175,7 @@ gem "rails-assets-diaspora_jsxc", "0.1.5.develop.7", source: "https://rails-asse # Tags -gem "acts-as-taggable-on", "5.0.0" +gem "acts-as-taggable-on", "6.0.0" # URIs and HTTP diff --git a/Gemfile.lock b/Gemfile.lock index 427d8353c..6a566a683 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -44,8 +44,8 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - acts-as-taggable-on (5.0.0) - activerecord (>= 4.2.8) + acts-as-taggable-on (6.0.0) + activerecord (~> 5.0) acts_as_api (1.0.1) activemodel (>= 3.0.0) activesupport (>= 3.0.0) @@ -763,7 +763,7 @@ PLATFORMS DEPENDENCIES active_model_serializers (= 0.9.7) activerecord-import (= 0.27.0) - acts-as-taggable-on (= 5.0.0) + acts-as-taggable-on (= 6.0.0) acts_as_api (= 1.0.1) addressable (= 2.5.2) asset_sync (= 2.5.0) diff --git a/app/models/profile.rb b/app/models/profile.rb index ad58f59b1..74ca9fec6 100644 --- a/app/models/profile.rb +++ b/app/models/profile.rb @@ -157,8 +157,9 @@ class Profile < ApplicationRecord end private + def clearable_fields - self.attributes.keys - ["id", "created_at", "updated_at", "person_id"] + attributes.keys - %w[id created_at updated_at person_id tag_list] end def build_image_url(url) From de5e22a5432b5a5526b4212c9ac425f6d8aaf81c Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 20:17:50 +0100 Subject: [PATCH 38/54] Bump faraday --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- .../api/openid_connect/clients_controller_spec.rb | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 7ec378043..d0c991335 100644 --- a/Gemfile +++ b/Gemfile @@ -180,7 +180,7 @@ gem "acts-as-taggable-on", "6.0.0" # URIs and HTTP gem "addressable", "2.5.2", require: "addressable/uri" -gem "faraday", "0.12.2" # also update User-Agent in OpenID specs +gem "faraday", "0.15.3" gem "faraday_middleware", "0.12.2" gem "faraday-cookie_jar", "0.0.6" gem "typhoeus", "1.3.0" diff --git a/Gemfile.lock b/Gemfile.lock index 6a566a683..72c01d4d3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -210,7 +210,7 @@ GEM factory_girl_rails (4.8.0) factory_girl (~> 4.8.0) railties (>= 3.0.0) - faraday (0.12.2) + faraday (0.15.3) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) @@ -403,9 +403,9 @@ GEM nenv (~> 0.1) shellany (~> 0.0) oauth (0.5.4) - oauth2 (1.4.0) - faraday (>= 0.8, < 0.13) - jwt (~> 1.0) + oauth2 (1.4.1) + faraday (>= 0.8, < 0.16.0) + jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) @@ -787,7 +787,7 @@ DEPENDENCIES entypo-rails (= 3.0.0) eye (= 0.10.0) factory_girl_rails (= 4.8.0) - faraday (= 0.12.2) + faraday (= 0.15.3) faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.12.2) fixture_builder (= 0.5.2.rc3) diff --git a/spec/controllers/api/openid_connect/clients_controller_spec.rb b/spec/controllers/api/openid_connect/clients_controller_spec.rb index b1f59640d..63beab027 100644 --- a/spec/controllers/api/openid_connect/clients_controller_spec.rb +++ b/spec/controllers/api/openid_connect/clients_controller_spec.rb @@ -8,7 +8,7 @@ describe Api::OpenidConnect::ClientsController, type: :controller, suppress_csrf .with(headers: { "Accept" => "*/*", "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3", - "User-Agent" => "Faraday v0.12.2" + "User-Agent" => "Faraday v#{Faraday::VERSION}" }) .to_return(status: 200, body: "[\"http://localhost\"]", headers: {}) post :create, params: {redirect_uris: ["http://localhost"], client_name: "diaspora client", @@ -28,7 +28,7 @@ describe Api::OpenidConnect::ClientsController, type: :controller, suppress_csrf .with(headers: { "Accept" => "*/*", "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3", - "User-Agent" => "Faraday v0.12.2" + "User-Agent" => "Faraday v#{Faraday::VERSION}" }) .to_return(status: 200, body: "[\"http://localhost\"]", headers: {}) post :create, params: {redirect_uris: ["http://localhost"], client_name: "diaspora client", @@ -89,14 +89,14 @@ describe Api::OpenidConnect::ClientsController, type: :controller, suppress_csrf .with(headers: { "Accept" => "*/*", "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3", - "User-Agent" => "Faraday v0.12.2" + "User-Agent" => "Faraday v#{Faraday::VERSION}" }) .to_return(status: 200, body: "[\"http://localhost\"]", headers: {}) stub_request(:get, "https://kentshikama.com/api/openid_connect/jwks.json") .with(headers: { "Accept" => "*/*", "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3", - "User-Agent" => "Faraday v0.12.2" + "User-Agent" => "Faraday v#{Faraday::VERSION}" }) .to_return(status: 200, body: "{\"keys\":[{\"kty\":\"RSA\",\"e\":\"AQAB\",\"n\":\"qpW\",\"use\":\"sig\"}]}", headers: {}) From 80f57673ab9374a24a9f6fb871bf144b04d7c349 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 20:18:46 +0100 Subject: [PATCH 39/54] Bump typhoeus --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index d0c991335..de4ffab02 100644 --- a/Gemfile +++ b/Gemfile @@ -183,7 +183,7 @@ gem "addressable", "2.5.2", require: "addressable/uri" gem "faraday", "0.15.3" gem "faraday_middleware", "0.12.2" gem "faraday-cookie_jar", "0.0.6" -gem "typhoeus", "1.3.0" +gem "typhoeus", "1.3.1" # Views diff --git a/Gemfile.lock b/Gemfile.lock index 72c01d4d3..119722de2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -711,7 +711,7 @@ GEM simple_oauth (~> 0.3.0) twitter-text (1.14.7) unf (~> 0.1.0) - typhoeus (1.3.0) + typhoeus (1.3.1) ethon (>= 0.9.0) tzinfo (1.2.5) thread_safe (~> 0.1) @@ -893,7 +893,7 @@ DEPENDENCIES turbo_dev_assets (= 0.0.2) twitter (= 6.2.0) twitter-text (= 1.14.7) - typhoeus (= 1.3.0) + typhoeus (= 1.3.1) uglifier (= 4.1.19) unicorn (= 5.4.1) unicorn-worker-killer (= 0.4.4) From 63b23056a584bb3ec2fd32ff95afbe1af2aaa60c Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 20:19:42 +0100 Subject: [PATCH 40/54] Bump gon --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index de4ffab02..cdfc01605 100644 --- a/Gemfile +++ b/Gemfile @@ -187,7 +187,7 @@ gem "typhoeus", "1.3.1" # Views -gem "gon", "6.2.0" +gem "gon", "6.2.1" gem "hamlit", "2.8.8" gem "mobile-fu", "1.4.0" gem "rails-timeago", "2.16.0" diff --git a/Gemfile.lock b/Gemfile.lock index 119722de2..faf57cb49 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -252,7 +252,7 @@ GEM terminal-table (>= 1.5.1) globalid (0.4.1) activesupport (>= 4.2.0) - gon (6.2.0) + gon (6.2.1) actionpack (>= 3.0) multi_json request_store (>= 1.0) @@ -793,7 +793,7 @@ DEPENDENCIES fixture_builder (= 0.5.2.rc3) fog-aws (= 3.3.0) fuubar (= 2.3.2) - gon (= 6.2.0) + gon (= 6.2.1) guard (= 2.14.2) guard-cucumber (= 2.1.2) guard-rspec (= 4.7.3) From 19556e7d7dc8d6f06fad934856dacf7e6cff4847 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 20:21:15 +0100 Subject: [PATCH 41/54] Bump hamlit --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index cdfc01605..15ea3cba8 100644 --- a/Gemfile +++ b/Gemfile @@ -188,7 +188,7 @@ gem "typhoeus", "1.3.1" # Views gem "gon", "6.2.1" -gem "hamlit", "2.8.8" +gem "hamlit", "2.9.1" gem "mobile-fu", "1.4.0" gem "rails-timeago", "2.16.0" gem "will_paginate", "3.1.6" diff --git a/Gemfile.lock b/Gemfile.lock index faf57cb49..c66cec62a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -286,7 +286,7 @@ GEM rake (>= 10, < 13) rubocop (>= 0.50.0) sysexits (~> 1.1) - hamlit (2.8.8) + hamlit (2.9.1) temple (>= 0.8.0) thor tilt @@ -799,7 +799,7 @@ DEPENDENCIES guard-rspec (= 4.7.3) guard-rubocop (= 1.3.0) haml_lint (= 0.28.0) - hamlit (= 2.8.8) + hamlit (= 2.9.1) handlebars_assets (= 0.23.2) http_accept_language (= 2.1.1) i18n-inflector-rails (= 1.0.7) From b062818289b640410096cac21154fa953c57bf42 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 20:22:31 +0100 Subject: [PATCH 42/54] Bump yard --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c66cec62a..85f9bbe75 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -755,7 +755,7 @@ GEM will_paginate (3.1.6) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.12) + yard (0.9.16) PLATFORMS ruby From 514a370f75074557e43c36aba2659ecb197303c5 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 20:23:05 +0100 Subject: [PATCH 43/54] Bump mail --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 85f9bbe75..6f0372f9e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -372,7 +372,7 @@ GEM lumberjack (1.0.13) macaddr (1.7.1) systemu (~> 2.6.2) - mail (2.7.0) + mail (2.7.1) mini_mime (>= 0.1.1) markdown-it-html5-embed (1.0.0) markerb (1.1.0) From 7f67d007a087059d309eacc6cb381662e8666ed8 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 20:24:49 +0100 Subject: [PATCH 44/54] Bump bindata --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6f0372f9e..920509a88 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,7 +64,7 @@ GEM autoprefixer-rails (8.6.5) execjs bcrypt (3.1.12) - bindata (2.4.3) + bindata (2.4.4) bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) From 37ec02dbd044f2b1d20abecb4dd7544f790c05e2 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 20:25:26 +0100 Subject: [PATCH 45/54] Bump domain_name --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 920509a88..3099dbb60 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -182,7 +182,7 @@ GEM uuid (~> 2.3, >= 2.3.8) diff-lcs (1.3) docile (1.3.1) - domain_name (0.5.20170404) + domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) entypo-rails (3.0.0) railties (>= 4.1, < 6) From 9b435f67dee0f5d46682184b90ac6e84eed1371a Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 20:26:11 +0100 Subject: [PATCH 46/54] Bump get_process_mem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3099dbb60..192a6a582 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -245,7 +245,7 @@ GEM fuubar (2.3.2) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) - get_process_mem (0.2.1) + get_process_mem (0.2.3) gherkin (4.1.3) gitlab (4.7.0) httparty (>= 0.14.0) From f3568d9fb31e0c822f515a2fc9ab1939cd59f0f1 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 20:28:27 +0100 Subject: [PATCH 47/54] Bump http --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 192a6a582..f41f8a2f3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -297,14 +297,14 @@ GEM hashdiff (0.3.7) hashie (3.5.7) hitimes (1.2.6) - http (3.0.0) + http (3.3.0) addressable (~> 2.3) http-cookie (~> 1.0) - http-form_data (>= 2.0.0.pre.pre2, < 3) + http-form_data (~> 2.0) http_parser.rb (~> 0.6.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (2.1.0) + http-form_data (2.1.1) http_accept_language (2.1.1) http_parser.rb (0.6.0) httparty (0.16.3) From 72112f8bd72faca286a2afd7f80a39316e608c84 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 20:29:15 +0100 Subject: [PATCH 48/54] Bump jsonpath --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f41f8a2f3..8b1512ba0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -348,7 +348,7 @@ GEM json-schema-rspec (0.0.4) json-schema (~> 2.5) rspec - jsonpath (0.8.11) + jsonpath (0.9.6) multi_json to_regexp (~> 0.2.1) jwt (1.5.6) From 5960b33df08d6851e754fb936ef0ee5898384d3c Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 20:29:54 +0100 Subject: [PATCH 49/54] Bump nio4r --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8b1512ba0..8fc7a183e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -396,7 +396,7 @@ GEM mysql2 (0.5.2) naught (1.1.0) nenv (0.3.0) - nio4r (2.3.0) + nio4r (2.3.1) nokogiri (1.8.5) mini_portile2 (~> 2.3.0) notiffany (0.1.1) From e1d65d50abdcc606026230df1f47cc746ad72a03 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 20:30:30 +0100 Subject: [PATCH 50/54] Bump rack-oauth2 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8fc7a183e..ba5f3412d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -486,7 +486,7 @@ GEM activesupport rack-mobile-detect (0.4.0) rack - rack-oauth2 (1.9.2) + rack-oauth2 (1.9.3) activesupport attr_required httpclient From 2210cf00387ca35a6d09646071fe17f12e76b46a Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 20:31:31 +0100 Subject: [PATCH 51/54] Bump timers --- Gemfile.lock | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ba5f3412d..321ee9c6f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -296,7 +296,6 @@ GEM tilt (>= 1.2) hashdiff (0.3.7) hashie (3.5.7) - hitimes (1.2.6) http (3.3.0) addressable (~> 2.3) http-cookie (~> 1.0) @@ -693,8 +692,7 @@ GEM thread_safe (0.3.6) tilt (2.0.8) timecop (0.9.1) - timers (4.1.2) - hitimes + timers (4.2.0) tins (1.20.2) to_regexp (0.2.1) turbo_dev_assets (0.0.2) From 6fb1e1f52489b4751ca22e596f049d383afa2002 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 10 Nov 2018 21:06:15 +0100 Subject: [PATCH 52/54] Bump jwt --- Gemfile.lock | 2 +- .../api/openid_connect/authorizations_controller_spec.rb | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 321ee9c6f..f63bd8bfc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -350,7 +350,7 @@ GEM jsonpath (0.9.6) multi_json to_regexp (~> 0.2.1) - jwt (1.5.6) + jwt (2.1.0) kgio (2.11.2) kostya-sigar (2.0.4) leaflet-rails (1.3.1) diff --git a/spec/controllers/api/openid_connect/authorizations_controller_spec.rb b/spec/controllers/api/openid_connect/authorizations_controller_spec.rb index 7ce14838a..ad6606d86 100644 --- a/spec/controllers/api/openid_connect/authorizations_controller_spec.rb +++ b/spec/controllers/api/openid_connect/authorizations_controller_spec.rb @@ -31,12 +31,10 @@ describe Api::OpenidConnect::AuthorizationsController, type: :request do context "as a request object" do it "should return a form page" do - header = JWT.encoded_header("none") payload_hash = {client_id: client.client_id, redirect_uri: "http://localhost:3000/", response_type: "id_token", scope: "openid", nonce: "hello", state: "hello", claims: {userinfo: {name: {essential: true}}}} - payload = JWT.encoded_payload(JSON.parse(payload_hash.to_json)) - request_object = header + "." + payload + "." + request_object = JWT.encode(payload_hash, nil, "none") get new_api_openid_connect_authorization_path, params: {client_id: client.client_id, redirect_uri: "http://localhost:3000/", response_type: "id_token", scope: "openid", nonce: "hello", state: "hello", request: request_object} @@ -46,11 +44,9 @@ describe Api::OpenidConnect::AuthorizationsController, type: :request do context "as a request object with no claims" do it "should return a form page" do - header = JWT.encoded_header("none") payload_hash = {client_id: client.client_id, redirect_uri: "http://localhost:3000/", response_type: "id_token", scope: "openid", nonce: "hello", state: "hello"} - payload = JWT.encoded_payload(JSON.parse(payload_hash.to_json)) - request_object = header + "." + payload + "." + request_object = JWT.encode(payload_hash, nil, "none") get new_api_openid_connect_authorization_path, params: {client_id: client.client_id, redirect_uri: "http://localhost:3000/", response_type: "id_token", scope: "openid", nonce: "hello", state: "hello", request: request_object} From ce10791526fbca60e1c7d224ee0029642b820f2f Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Thu, 15 Nov 2018 00:33:05 +0100 Subject: [PATCH 53/54] Bump guard --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 15ea3cba8..dcfbe44a5 100644 --- a/Gemfile +++ b/Gemfile @@ -239,7 +239,7 @@ end group :development do # Automatic test runs - gem "guard", "2.14.2", require: false + gem "guard", "2.15.0", require: false gem "guard-cucumber", "2.1.2", require: false gem "guard-rspec", "4.7.3", require: false gem "guard-rubocop", "1.3.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index f63bd8bfc..a6bc2945d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -256,7 +256,7 @@ GEM actionpack (>= 3.0) multi_json request_store (>= 1.0) - guard (2.14.2) + guard (2.15.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) @@ -377,7 +377,7 @@ GEM markerb (1.1.0) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) - method_source (0.9.1) + method_source (0.9.2) mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) @@ -470,7 +470,7 @@ GEM pronto-scss (0.9.1) pronto (~> 0.9.0) scss_lint (~> 0.43, >= 0.43.0) - pry (0.12.0) + pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) pry-byebug (3.6.0) @@ -792,7 +792,7 @@ DEPENDENCIES fog-aws (= 3.3.0) fuubar (= 2.3.2) gon (= 6.2.1) - guard (= 2.14.2) + guard (= 2.15.0) guard-cucumber (= 2.1.2) guard-rspec (= 4.7.3) guard-rubocop (= 1.3.0) From b24b31256e28eddcd1dbd108f1640c177c484ad6 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 17 Nov 2018 20:00:23 +0100 Subject: [PATCH 54/54] Bump warden closes #7930 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a6bc2945d..94470174c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -738,8 +738,8 @@ GEM activesupport (>= 3) railties (>= 3) yard (~> 0.9.11) - warden (1.2.7) - rack (>= 1.0) + warden (1.2.8) + rack (>= 2.0.6) webfinger (1.1.0) activesupport httpclient (>= 2.4)