From 94a32b2833e11d44b76d532417c624b5b9c9e95f Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 23 Mar 2019 23:52:42 +0100 Subject: [PATCH 01/33] Bump rails --- Gemfile | 2 +- Gemfile.lock | 78 ++++++++++++++++++++++++++-------------------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Gemfile b/Gemfile index b7ae543c9..03157827c 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "rails", "5.1.6" +gem "rails", "5.1.6.2" # Legacy Rails features, remove me! # responders (class level) diff --git a/Gemfile.lock b/Gemfile.lock index e2f46878b..20b0b6c0d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,25 +2,25 @@ GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - actioncable (5.1.6) - actionpack (= 5.1.6) + actioncable (5.1.6.2) + actionpack (= 5.1.6.2) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.6) - actionpack (= 5.1.6) - actionview (= 5.1.6) - activejob (= 5.1.6) + actionmailer (5.1.6.2) + actionpack (= 5.1.6.2) + actionview (= 5.1.6.2) + activejob (= 5.1.6.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.6) - actionview (= 5.1.6) - activesupport (= 5.1.6) + actionpack (5.1.6.2) + actionview (= 5.1.6.2) + activesupport (= 5.1.6.2) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.6) - activesupport (= 5.1.6) + actionview (5.1.6.2) + activesupport (= 5.1.6.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -28,18 +28,18 @@ GEM active_model_serializers (0.9.7) activemodel (>= 3.2) concurrent-ruby (~> 1.0) - activejob (5.1.6) - activesupport (= 5.1.6) + activejob (5.1.6.2) + activesupport (= 5.1.6.2) globalid (>= 0.3.6) - activemodel (5.1.6) - activesupport (= 5.1.6) - activerecord (5.1.6) - activemodel (= 5.1.6) - activesupport (= 5.1.6) + activemodel (5.1.6.2) + activesupport (= 5.1.6.2) + activerecord (5.1.6.2) + activemodel (= 5.1.6.2) + activesupport (= 5.1.6.2) arel (~> 8.0) activerecord-import (0.27.0) activerecord (>= 3.2) - activesupport (5.1.6) + activesupport (5.1.6.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -125,7 +125,7 @@ GEM compass (~> 1.0.0) sass-rails (< 5.1) sprockets (< 4.0) - concurrent-ruby (1.1.3) + concurrent-ruby (1.1.5) configurate (0.3.1) connection_pool (2.2.2) coveralls (0.8.22) @@ -194,7 +194,7 @@ GEM entypo-rails (3.0.0) railties (>= 4.1, < 6) equalizer (0.0.11) - erubi (1.7.1) + erubi (1.8.0) eslintrb (2.1.0) execjs multi_json (>= 1.3) @@ -257,7 +257,7 @@ GEM gitlab (4.7.0) httparty (>= 0.14.0) terminal-table (>= 1.5.1) - globalid (0.4.1) + globalid (0.4.2) activesupport (>= 4.2.0) gon (6.2.1) actionpack (>= 3.0) @@ -313,7 +313,7 @@ GEM mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.1.1) + i18n (1.6.0) concurrent-ruby (~> 1.0) i18n-inflector (2.6.7) i18n (>= 0.4.1) @@ -502,17 +502,17 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.1.6) - actioncable (= 5.1.6) - actionmailer (= 5.1.6) - actionpack (= 5.1.6) - actionview (= 5.1.6) - activejob (= 5.1.6) - activemodel (= 5.1.6) - activerecord (= 5.1.6) - activesupport (= 5.1.6) + rails (5.1.6.2) + actioncable (= 5.1.6.2) + actionmailer (= 5.1.6.2) + actionpack (= 5.1.6.2) + actionview (= 5.1.6.2) + activejob (= 5.1.6.2) + activemodel (= 5.1.6.2) + activerecord (= 5.1.6.2) + activesupport (= 5.1.6.2) bundler (>= 1.3.0) - railties (= 5.1.6) + railties (= 5.1.6.2) sprockets-rails (>= 2.0.0) rails-assets-autosize (4.0.2) rails-assets-backbone (1.3.3) @@ -575,16 +575,16 @@ GEM rails-timeago (2.16.0) actionpack (>= 3.1) activesupport (>= 3.1) - railties (5.1.6) - actionpack (= 5.1.6) - activesupport (= 5.1.6) + railties (5.1.6.2) + actionpack (= 5.1.6.2) + activesupport (= 5.1.6.2) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake raindrops (0.19.0) - rake (12.3.1) + rake (12.3.2) rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) @@ -841,7 +841,7 @@ DEPENDENCIES rack-piwik (= 0.3.0) rack-rewrite (= 1.5.1) rack-ssl (= 1.4.1) - rails (= 5.1.6) + rails (= 5.1.6.2) rails-assets-autosize (= 4.0.2)! rails-assets-backbone (= 1.3.3)! rails-assets-blueimp-gallery (= 2.33.0)! @@ -904,4 +904,4 @@ DEPENDENCIES will_paginate (= 3.1.6) BUNDLED WITH - 1.17.1 + 1.17.3 From c063f6fa1b693137368eaef68482aedd10e9fe26 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 23 Mar 2019 23:55:04 +0100 Subject: [PATCH 02/33] Bump devise --- Gemfile | 2 +- Gemfile.lock | 4 ++-- app/views/devise/confirmations/new.html.haml | 4 ++-- app/views/devise/passwords/edit.mobile.haml | 2 +- app/views/devise/passwords/new.haml | 2 +- app/views/devise/passwords/new.mobile.haml | 2 +- app/views/devise/unlocks/new.html.haml | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 03157827c..2e6eb08ab 100644 --- a/Gemfile +++ b/Gemfile @@ -26,7 +26,7 @@ gem "json-schema", "2.8.1" # Authentication -gem "devise", "4.5.0" +gem "devise", "4.6.1" gem "devise_lastseenable", "0.0.6" # Captcha diff --git a/Gemfile.lock b/Gemfile.lock index 20b0b6c0d..65e2e7a09 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -163,7 +163,7 @@ GEM cucumber-tag_expressions (1.1.1) cucumber-wire (0.0.1) database_cleaner (1.7.0) - devise (4.5.0) + devise (4.6.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 6.0) @@ -780,7 +780,7 @@ DEPENDENCIES cucumber-api-steps (= 0.14) cucumber-rails (= 1.6.0) database_cleaner (= 1.7.0) - devise (= 4.5.0) + devise (= 4.6.1) devise_lastseenable (= 0.0.6) diaspora-prosody-config (= 0.0.7) diaspora_federation-json_schema (= 0.2.5) diff --git a/app/views/devise/confirmations/new.html.haml b/app/views/devise/confirmations/new.html.haml index 04965f756..b1a4555d8 100644 --- a/app/views/devise/confirmations/new.html.haml +++ b/app/views/devise/confirmations/new.html.haml @@ -1,10 +1,10 @@ %h2 Resend confirmation instructions = form_for(resource, :as => resource_name, :url => confirmation_path(resource_name)) do |f| - = devise_error_messages! + = render partial: "devise/shared/error_messages" %p = f.label :email %br/ = f.text_field :email %p = f.submit t('.resend_confirmation') -= render :partial => "devise/shared/links" += render partial: "devise/shared/links" diff --git a/app/views/devise/passwords/edit.mobile.haml b/app/views/devise/passwords/edit.mobile.haml index a9d7df344..b3d758b12 100644 --- a/app/views/devise/passwords/edit.mobile.haml +++ b/app/views/devise/passwords/edit.mobile.haml @@ -6,7 +6,7 @@ .login-form .login-container = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| - = devise_error_messages! + = render partial: "devise/shared/error_messages", formats: [:html] = f.hidden_field :reset_password_token %fieldset %legend diff --git a/app/views/devise/passwords/new.haml b/app/views/devise/passwords/new.haml index 627aa3a1d..9a5683b63 100644 --- a/app/views/devise/passwords/new.haml +++ b/app/views/devise/passwords/new.haml @@ -9,7 +9,7 @@ = AppConfig.settings.pod_name = form_for(resource, as: resource_name, url: password_path(resource_name), html: {class: "form-horizontal block-form"}, autocomplete: 'off') do |f| - - if !devise_error_messages!.empty? + - unless resource.errors.empty? %legend %i = t('devise.passwords.new.no_account') # this is an error message and should not be displayed as a legend diff --git a/app/views/devise/passwords/new.mobile.haml b/app/views/devise/passwords/new.mobile.haml index af496b0bf..63bcedfd8 100644 --- a/app/views/devise/passwords/new.mobile.haml +++ b/app/views/devise/passwords/new.mobile.haml @@ -9,7 +9,7 @@ %fieldset %legend =t('devise.passwords.new.forgot_password') - - unless devise_error_messages!.empty? + - unless resource.errors.empty? %i= t('devise.passwords.new.no_account') .control-group diff --git a/app/views/devise/unlocks/new.html.haml b/app/views/devise/unlocks/new.html.haml index 6fff589eb..d3f1d629d 100644 --- a/app/views/devise/unlocks/new.html.haml +++ b/app/views/devise/unlocks/new.html.haml @@ -1,10 +1,10 @@ %h2 Resend unlock instructions = form_for(resource, :as => resource_name, :url => unlock_path(resource_name)) do |f| - = devise_error_messages! + = render partial: "devise/shared/error_messages" %p = f.label :email %br/ = f.text_field :email %p = f.submit t('.resend_unlock') -= render :partial => "devise/shared/links" += render partial: "devise/shared/links" From c253272d8397b3270bc79daf9147fa6f2ec434e3 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 23 Mar 2019 23:59:50 +0100 Subject: [PATCH 03/33] Bump bootstrap-sass --- Gemfile | 2 +- Gemfile.lock | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 2e6eb08ab..144bf1cbb 100644 --- a/Gemfile +++ b/Gemfile @@ -57,7 +57,7 @@ gem "rack-cors", "1.0.2", require: "rack/cors" # CSS gem "autoprefixer-rails", "8.6.5" -gem "bootstrap-sass", "3.3.7" +gem "bootstrap-sass", "3.4.1" gem "bootstrap-switch-rails", "3.3.3" # 3.3.4 is broken, see https://github.com/Bttstrp/bootstrap-switch/issues/691 gem "compass-rails", "3.1.0" gem "sass-rails", "5.0.7" diff --git a/Gemfile.lock b/Gemfile.lock index 65e2e7a09..f9b622fa9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -66,9 +66,9 @@ GEM backports (3.11.4) bcrypt (3.1.12) bindata (2.4.4) - bootstrap-sass (3.3.7) + bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) - sass (>= 3.3.4) + sassc (>= 2.0.0) bootstrap-switch-rails (3.3.3) buftok (0.2.0) builder (3.2.3) @@ -639,6 +639,9 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + sassc (2.0.1) + ffi (~> 1.9) + rake sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) @@ -770,7 +773,7 @@ DEPENDENCIES addressable (= 2.5.2) asset_sync (= 2.5.0) autoprefixer-rails (= 8.6.5) - bootstrap-sass (= 3.3.7) + bootstrap-sass (= 3.4.1) bootstrap-switch-rails (= 3.3.3) capybara (= 3.11.1) carrierwave (= 1.2.3) From 360780c17ff3f2d6c6bee321f10b960f604fa22e Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 00:13:26 +0100 Subject: [PATCH 04/33] Bump responders --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 144bf1cbb..a911d3a7e 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gem "rails", "5.1.6.2" # Legacy Rails features, remove me! # responders (class level) -gem "responders", "2.4.0" +gem "responders", "2.4.1" # Appserver diff --git a/Gemfile.lock b/Gemfile.lock index f9b622fa9..ef71b1f4d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -593,9 +593,9 @@ GEM regexp_parser (1.3.0) request_store (1.4.1) rack (>= 1.4) - responders (2.4.0) - actionpack (>= 4.2.0, < 5.3) - railties (>= 4.2.0, < 5.3) + responders (2.4.1) + actionpack (>= 4.2.0, < 6.0) + railties (>= 4.2.0, < 6.0) rspec (3.8.0) rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) @@ -874,7 +874,7 @@ DEPENDENCIES rb-inotify (= 0.9.10) redcarpet (= 3.4.0) redis (= 3.3.5) - responders (= 2.4.0) + responders (= 2.4.1) rspec-json_expectations (~> 2.1) rspec-rails (= 3.8.1) rubocop (= 0.60.0) From 23d637b9a12d576ce54b3468e2fa10c26524781c Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 00:19:37 +0100 Subject: [PATCH 05/33] Bump unicorn --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a911d3a7e..2aaaf1da4 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ gem "responders", "2.4.1" # Appserver -gem "unicorn", "5.4.1", require: false +gem "unicorn", "5.5.0", require: false gem "unicorn-worker-killer", "0.4.4" # Federation diff --git a/Gemfile.lock b/Gemfile.lock index ef71b1f4d..2c908bd98 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -726,7 +726,7 @@ GEM unf_ext unf_ext (0.0.7.5) unicode-display_width (1.4.0) - unicorn (5.4.1) + unicorn (5.5.0) kgio (~> 2.6) raindrops (~> 0.7) unicorn-worker-killer (0.4.4) @@ -899,7 +899,7 @@ DEPENDENCIES twitter-text (= 1.14.7) typhoeus (= 1.3.1) uglifier (= 4.1.19) - unicorn (= 5.4.1) + unicorn (= 5.5.0) unicorn-worker-killer (= 0.4.4) uuid (= 2.3.9) versionist (= 1.7.0) From f4fa7e10bdb67aaa5da6221f69e85299d5355474 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 00:21:37 +0100 Subject: [PATCH 06/33] Bump json --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 2aaaf1da4..fe9efa706 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ gem "diaspora_federation-rails", "0.2.5" # API and JSON gem "acts_as_api", "1.0.1" -gem "json", "2.1.0" +gem "json", "2.2.0" gem "json-schema", "2.8.1" # Authentication diff --git a/Gemfile.lock b/Gemfile.lock index 2c908bd98..b6e6dce7a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -340,7 +340,7 @@ GEM js_image_paths (0.1.1) rails (>= 4.0, < 6.0) sprockets (>= 3.0.0) - json (2.1.0) + json (2.2.0) json-jwt (1.9.4) activesupport aes_key_wrap @@ -812,7 +812,7 @@ DEPENDENCIES jquery-rails (= 4.3.3) js-routes (= 1.4.4) js_image_paths (= 0.1.1) - json (= 2.1.0) + json (= 2.2.0) json-schema (= 2.8.1) json-schema-rspec (= 0.0.4) leaflet-rails (= 1.3.1) From 7b201f4bb907894205a3399f03e1bdbac6ad57b8 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 00:25:26 +0100 Subject: [PATCH 07/33] Bump sidekiq --- Gemfile | 2 +- Gemfile.lock | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index fe9efa706..776edde77 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.2.3" +gem "sidekiq", "5.2.5" # Scheduled processing diff --git a/Gemfile.lock b/Gemfile.lock index b6e6dce7a..b1fdf4924 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -495,7 +495,7 @@ GEM json-jwt (>= 1.9.0) rack rack-piwik (0.3.0) - rack-protection (2.0.4) + rack-protection (2.0.5) rack rack-rewrite (1.5.1) rack-ssl (1.4.1) @@ -652,8 +652,9 @@ GEM shellany (0.0.1) shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.2.3) + sidekiq (5.2.5) connection_pool (~> 2.2, >= 2.2.2) + rack (>= 1.5.0) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) sidekiq-cron (1.0.4) @@ -883,7 +884,7 @@ DEPENDENCIES sass-rails (= 5.0.7) secure_headers (= 6.0.0) shoulda-matchers (= 3.1.2) - sidekiq (= 5.2.3) + sidekiq (= 5.2.5) sidekiq-cron (= 1.0.4) simple_captcha2 (= 0.4.3) simplecov (= 0.16.1) From a63f11bbf47dd531dcd7c82d9919603c75ced501 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 00:30:24 +0100 Subject: [PATCH 08/33] Bump sidekiq-cron --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 776edde77..9f7d81dae 100644 --- a/Gemfile +++ b/Gemfile @@ -40,7 +40,7 @@ gem "sidekiq", "5.2.5" # Scheduled processing -gem "sidekiq-cron", "1.0.4" +gem "sidekiq-cron", "1.1.0" # Compression diff --git a/Gemfile.lock b/Gemfile.lock index b1fdf4924..f5a751538 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -199,7 +199,7 @@ GEM execjs multi_json (>= 1.3) rake - et-orbi (1.1.6) + et-orbi (1.1.7) tzinfo ethon (0.11.0) ffi (>= 1.3.0) @@ -246,8 +246,8 @@ 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) + fugit (1.1.8) + et-orbi (~> 1.1, >= 1.1.7) raabro (~> 1.1) fuubar (2.3.2) rspec-core (~> 3.0) @@ -657,7 +657,7 @@ GEM rack (>= 1.5.0) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) - sidekiq-cron (1.0.4) + sidekiq-cron (1.1.0) fugit (~> 1.1) sidekiq (>= 4.2.1) simple_captcha2 (0.4.3) @@ -885,7 +885,7 @@ DEPENDENCIES secure_headers (= 6.0.0) shoulda-matchers (= 3.1.2) sidekiq (= 5.2.5) - sidekiq-cron (= 1.0.4) + sidekiq-cron (= 1.1.0) simple_captcha2 (= 0.4.3) simplecov (= 0.16.1) sinon-rails (= 1.15.0) From 54e44d6d7e8c65831bed6e704d8ecf219a75d720 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 00:35:46 +0100 Subject: [PATCH 09/33] Bump uglifier --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 9f7d81dae..60c06e4a7 100644 --- a/Gemfile +++ b/Gemfile @@ -44,7 +44,7 @@ gem "sidekiq-cron", "1.1.0" # Compression -gem "uglifier", "4.1.19" +gem "uglifier", "4.1.20" # Configuration diff --git a/Gemfile.lock b/Gemfile.lock index f5a751538..573aafc21 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -721,7 +721,7 @@ GEM ethon (>= 0.9.0) tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.19) + uglifier (4.1.20) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext @@ -899,7 +899,7 @@ DEPENDENCIES twitter (= 6.2.0) twitter-text (= 1.14.7) typhoeus (= 1.3.1) - uglifier (= 4.1.19) + uglifier (= 4.1.20) unicorn (= 5.5.0) unicorn-worker-killer (= 0.4.4) uuid (= 2.3.9) From cd7af6df5054b9a6ed4e444f71dd8c4ebb173c0a Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 00:45:11 +0100 Subject: [PATCH 10/33] Bump pg --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 60c06e4a7..fe3e3e7e3 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.1.3" + gem "pg", "1.1.4" end diff --git a/Gemfile.lock b/Gemfile.lock index 573aafc21..88ed0cb3a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -447,7 +447,7 @@ GEM parallel (1.12.1) parser (2.5.3.0) ast (~> 2.4.0) - pg (1.1.3) + pg (1.1.4) phantomjs (2.1.1.0) poltergeist (1.18.1) capybara (>= 2.1, < 4) @@ -831,7 +831,7 @@ DEPENDENCIES omniauth-wordpress (= 0.2.2) open_graph_reader (= 0.6.2) openid_connect (= 1.1.6) - pg (= 1.1.3) + pg (= 1.1.4) poltergeist (= 1.18.1) pronto (= 0.9.5) pronto-eslint (= 0.9.1) From b7183d7cee490a58f0f105ec3a13f39a880ae965 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 00:46:37 +0100 Subject: [PATCH 11/33] Bump activerecord-import --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index fe3e3e7e3..154209619 100644 --- a/Gemfile +++ b/Gemfile @@ -73,7 +73,7 @@ group :postgresql, optional: true do end -gem "activerecord-import", "0.27.0" +gem "activerecord-import", "1.0.1" # File uploading diff --git a/Gemfile.lock b/Gemfile.lock index 88ed0cb3a..1db1348a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,7 +37,7 @@ GEM activemodel (= 5.1.6.2) activesupport (= 5.1.6.2) arel (~> 8.0) - activerecord-import (0.27.0) + activerecord-import (1.0.1) activerecord (>= 3.2) activesupport (5.1.6.2) concurrent-ruby (~> 1.0, >= 1.0.2) @@ -768,7 +768,7 @@ PLATFORMS DEPENDENCIES active_model_serializers (= 0.9.7) - activerecord-import (= 0.27.0) + activerecord-import (= 1.0.1) acts-as-taggable-on (= 6.0.0) acts_as_api (= 1.0.1) addressable (= 2.5.2) From da83456660e14b7d1144a4e9ab1996ff3034589a Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 00:48:19 +0100 Subject: [PATCH 12/33] Bump carrierwave --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 154209619..4252f8852 100644 --- a/Gemfile +++ b/Gemfile @@ -77,7 +77,7 @@ gem "activerecord-import", "1.0.1" # File uploading -gem "carrierwave", "1.2.3" +gem "carrierwave", "1.3.1" gem "fog-aws", "3.3.0" gem "mini_magick", "4.9.2" diff --git a/Gemfile.lock b/Gemfile.lock index 1db1348a1..b010ad82c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,7 +81,7 @@ GEM rack-test (>= 0.6.3) regexp_parser (~> 1.2) xpath (~> 3.2) - carrierwave (1.2.3) + carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) @@ -777,7 +777,7 @@ DEPENDENCIES bootstrap-sass (= 3.4.1) bootstrap-switch-rails (= 3.3.3) capybara (= 3.11.1) - carrierwave (= 1.2.3) + carrierwave (= 1.3.1) compass-rails (= 3.1.0) configurate (= 0.3.1) coveralls (= 0.8.22) From c8bef1077d7983c49a80895df852579665fba7d4 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 00:50:19 +0100 Subject: [PATCH 13/33] Bump fog-aws --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 4252f8852..76d31432d 100644 --- a/Gemfile +++ b/Gemfile @@ -78,7 +78,7 @@ gem "activerecord-import", "1.0.1" # File uploading gem "carrierwave", "1.3.1" -gem "fog-aws", "3.3.0" +gem "fog-aws", "3.4.0" gem "mini_magick", "4.9.2" # GUID generation diff --git a/Gemfile.lock b/Gemfile.lock index b010ad82c..210df81d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -229,7 +229,7 @@ GEM activerecord (>= 2) activesupport (>= 2) hashdiff - fog-aws (3.3.0) + fog-aws (3.4.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -797,7 +797,7 @@ DEPENDENCIES faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.12.2) fixture_builder (= 0.5.2.rc3) - fog-aws (= 3.3.0) + fog-aws (= 3.4.0) fuubar (= 2.3.2) gon (= 6.2.1) guard (= 2.15.0) From 8a10655f7f323658a425648ebdea106397f8c863 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 00:54:54 +0100 Subject: [PATCH 14/33] Bump mini_magick --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 76d31432d..86e8ae7ab 100644 --- a/Gemfile +++ b/Gemfile @@ -79,7 +79,7 @@ gem "activerecord-import", "1.0.1" gem "carrierwave", "1.3.1" gem "fog-aws", "3.4.0" -gem "mini_magick", "4.9.2" +gem "mini_magick", "4.9.3" # GUID generation gem "uuid", "2.3.9" diff --git a/Gemfile.lock b/Gemfile.lock index 210df81d1..85108a3ff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -384,7 +384,7 @@ GEM mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) - mini_magick (4.9.2) + mini_magick (4.9.3) mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.11.3) @@ -820,7 +820,7 @@ DEPENDENCIES logging-rails (= 0.6.0) markdown-it-html5-embed (= 1.0.0) markerb (= 1.1.0) - mini_magick (= 4.9.2) + mini_magick (= 4.9.3) minitest mobile-fu (= 1.4.0) mysql2 (= 0.5.2) From adaca8d0a3c76ead7a1eb437b5eec335d8503efd Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 00:55:47 +0100 Subject: [PATCH 15/33] Bump handlebars_assets --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 86e8ae7ab..727325584 100644 --- a/Gemfile +++ b/Gemfile @@ -90,7 +90,7 @@ gem "entypo-rails", "3.0.0" # JavaScript -gem "handlebars_assets", "0.23.2" +gem "handlebars_assets", "0.23.3" gem "jquery-rails", "4.3.3" gem "js-routes", "1.4.4" gem "js_image_paths", "0.1.1" diff --git a/Gemfile.lock b/Gemfile.lock index 85108a3ff..b14419412 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -293,7 +293,7 @@ GEM temple (>= 0.8.0) thor tilt - handlebars_assets (0.23.2) + handlebars_assets (0.23.3) execjs (~> 2.0) sprockets (>= 2.0.0) tilt (>= 1.2) @@ -698,7 +698,7 @@ GEM unicode-display_width (~> 1.1, >= 1.1.1) thor (0.19.4) thread_safe (0.3.6) - tilt (2.0.8) + tilt (2.0.9) timecop (0.9.1) timers (4.2.0) tins (1.20.2) @@ -805,7 +805,7 @@ DEPENDENCIES guard-rubocop (= 1.3.0) haml_lint (= 0.28.0) hamlit (= 2.9.1) - handlebars_assets (= 0.23.2) + handlebars_assets (= 0.23.3) http_accept_language (= 2.1.1) i18n-inflector-rails (= 1.0.7) jasmine (= 3.3.0) From 3b0f435f6941f2dc84d57c0779e9c927588388cf Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 00:58:58 +0100 Subject: [PATCH 16/33] Bump rails-i18n --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 727325584..5de91f9c5 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.2" +gem "rails-i18n", "5.1.3" # Mail diff --git a/Gemfile.lock b/Gemfile.lock index b14419412..d81e1503d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -569,7 +569,7 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - rails-i18n (5.1.2) + rails-i18n (5.1.3) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) rails-timeago (2.16.0) @@ -869,7 +869,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.2) + rails-i18n (= 5.1.3) rails-timeago (= 2.16.0) rb-fsevent (= 0.10.3) rb-inotify (= 0.9.10) From da39750244147de1d48d9c20bf85eeaad67016e4 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 01:03:03 +0100 Subject: [PATCH 17/33] Bump nokogiri --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 5de91f9c5..1936e71b0 100644 --- a/Gemfile +++ b/Gemfile @@ -140,7 +140,7 @@ gem "leaflet-rails", "1.3.1" # Parsing -gem "nokogiri", "1.8.5" +gem "nokogiri", "1.10.1" 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" diff --git a/Gemfile.lock b/Gemfile.lock index d81e1503d..e20134a40 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -386,7 +386,7 @@ GEM mime-types-data (3.2018.0812) mini_magick (4.9.3) mini_mime (1.0.1) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) mobile-fu (1.4.0) rack-mobile-detect @@ -399,8 +399,8 @@ GEM naught (1.1.0) nenv (0.3.0) nio4r (2.3.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) @@ -824,7 +824,7 @@ DEPENDENCIES minitest mobile-fu (= 1.4.0) mysql2 (= 0.5.2) - nokogiri (= 1.8.5) + nokogiri (= 1.10.1) omniauth (= 1.8.1) omniauth-tumblr (= 1.2) omniauth-twitter (= 1.4.0) From 05472cc4f9e5a3f8f38571e8a8dd14da39862b15 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 01:04:54 +0100 Subject: [PATCH 18/33] Bump secure_headers --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 1936e71b0..42062cd61 100644 --- a/Gemfile +++ b/Gemfile @@ -152,7 +152,7 @@ gem "string-direction", "1.2.1" # Security Headers -gem "secure_headers", "6.0.0" +gem "secure_headers", "6.1.0" # Services diff --git a/Gemfile.lock b/Gemfile.lock index e20134a40..c00491bb1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -648,7 +648,7 @@ GEM scss_lint (0.55.0) rake (>= 0.9, < 13) sass (~> 3.4.20) - secure_headers (6.0.0) + secure_headers (6.1.0) shellany (0.0.1) shoulda-matchers (3.1.2) activesupport (>= 4.0.0) @@ -882,7 +882,7 @@ DEPENDENCIES ruby-oembed (= 0.12.0) rubyzip (= 1.2.2) sass-rails (= 5.0.7) - secure_headers (= 6.0.0) + secure_headers (= 6.1.0) shoulda-matchers (= 3.1.2) sidekiq (= 5.2.5) sidekiq-cron (= 1.1.0) From 0372924b9053daf7bd7bf5a51fc0b09f7c3a1549 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 01:05:50 +0100 Subject: [PATCH 19/33] Bump omniauth --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 42062cd61..92b75ecf4 100644 --- a/Gemfile +++ b/Gemfile @@ -156,7 +156,7 @@ gem "secure_headers", "6.1.0" # Services -gem "omniauth", "1.8.1" +gem "omniauth", "1.9.0" gem "omniauth-tumblr", "1.2" gem "omniauth-twitter", "1.4.0" gem "omniauth-wordpress", "0.2.2" diff --git a/Gemfile.lock b/Gemfile.lock index c00491bb1..f802fc6eb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -298,7 +298,7 @@ GEM sprockets (>= 2.0.0) tilt (>= 1.2) hashdiff (0.3.7) - hashie (3.5.7) + hashie (3.6.0) http (3.3.0) addressable (~> 2.3) http-cookie (~> 1.0) @@ -413,8 +413,8 @@ GEM rack (>= 1.2, < 3) octokit (4.13.0) sawyer (~> 0.8.0, >= 0.5.3) - omniauth (1.8.1) - hashie (>= 3.4.6, < 3.6.0) + omniauth (1.9.0) + hashie (>= 3.4.6, < 3.7.0) rack (>= 1.6.2, < 3) omniauth-oauth (1.1.0) oauth @@ -825,7 +825,7 @@ DEPENDENCIES mobile-fu (= 1.4.0) mysql2 (= 0.5.2) nokogiri (= 1.10.1) - omniauth (= 1.8.1) + omniauth (= 1.9.0) omniauth-tumblr (= 1.2) omniauth-twitter (= 1.4.0) omniauth-wordpress (= 0.2.2) From 02617a3562e496eac2acfacbfc63bc3122d6ee71 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 01:11:09 +0100 Subject: [PATCH 20/33] Bump faraday --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 92b75ecf4..7f7c3abb1 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.15.3" +gem "faraday", "0.15.4" gem "faraday_middleware", "0.12.2" gem "faraday-cookie_jar", "0.0.6" gem "typhoeus", "1.3.1" diff --git a/Gemfile.lock b/Gemfile.lock index f802fc6eb..61272e2de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -217,7 +217,7 @@ GEM factory_girl_rails (4.8.0) factory_girl (~> 4.8.0) railties (>= 3.0.0) - faraday (0.15.3) + faraday (0.15.4) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) @@ -793,7 +793,7 @@ DEPENDENCIES entypo-rails (= 3.0.0) eye (= 0.10.0) factory_girl_rails (= 4.8.0) - faraday (= 0.15.3) + faraday (= 0.15.4) faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.12.2) fixture_builder (= 0.5.2.rc3) From 2585fb9b49603f187a3d0d1390fb01beb66a4673 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 01:13:59 +0100 Subject: [PATCH 21/33] Bump hamlit --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 7f7c3abb1..977be7c1a 100644 --- a/Gemfile +++ b/Gemfile @@ -188,7 +188,7 @@ gem "typhoeus", "1.3.1" # Views gem "gon", "6.2.1" -gem "hamlit", "2.9.1" +gem "hamlit", "2.9.2" 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 61272e2de..bc91ee94e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -289,7 +289,7 @@ GEM rake (>= 10, < 13) rubocop (>= 0.50.0) sysexits (~> 1.1) - hamlit (2.9.1) + hamlit (2.9.2) temple (>= 0.8.0) thor tilt @@ -691,7 +691,7 @@ GEM httpclient (>= 2.4) sysexits (1.2.0) systemu (2.6.5) - temple (0.8.0) + temple (0.8.1) term-ansicolor (1.7.0) tins (~> 1.0) terminal-table (1.8.0) @@ -804,7 +804,7 @@ DEPENDENCIES guard-rspec (= 4.7.3) guard-rubocop (= 1.3.0) haml_lint (= 0.28.0) - hamlit (= 2.9.1) + hamlit (= 2.9.2) handlebars_assets (= 0.23.3) http_accept_language (= 2.1.1) i18n-inflector-rails (= 1.0.7) From 5195f7daacee1c4f3ea4ca772f9a4217ebbb16cb Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 01:15:50 +0100 Subject: [PATCH 22/33] Bump rails-timeago --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 977be7c1a..84b1673f0 100644 --- a/Gemfile +++ b/Gemfile @@ -190,7 +190,7 @@ gem "typhoeus", "1.3.1" gem "gon", "6.2.1" gem "hamlit", "2.9.2" gem "mobile-fu", "1.4.0" -gem "rails-timeago", "2.16.0" +gem "rails-timeago", "2.17.1" gem "will_paginate", "3.1.6" # Logging diff --git a/Gemfile.lock b/Gemfile.lock index bc91ee94e..a256ad56c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -572,7 +572,7 @@ GEM rails-i18n (5.1.3) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) - rails-timeago (2.16.0) + rails-timeago (2.17.1) actionpack (>= 3.1) activesupport (>= 3.1) railties (5.1.6.2) @@ -870,7 +870,7 @@ DEPENDENCIES rails-assets-utatti-perfect-scrollbar (= 1.4.0)! rails-controller-testing (= 1.0.2) rails-i18n (= 5.1.3) - rails-timeago (= 2.16.0) + rails-timeago (= 2.17.1) rb-fsevent (= 0.10.3) rb-inotify (= 0.9.10) redcarpet (= 3.4.0) From 6f53f1bc0a6b9fe18da9850082003f413cb2ee90 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 01:17:03 +0100 Subject: [PATCH 23/33] Bump will_paginate --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 84b1673f0..327adc13c 100644 --- a/Gemfile +++ b/Gemfile @@ -191,7 +191,7 @@ gem "gon", "6.2.1" gem "hamlit", "2.9.2" gem "mobile-fu", "1.4.0" gem "rails-timeago", "2.17.1" -gem "will_paginate", "3.1.6" +gem "will_paginate", "3.1.7" # Logging diff --git a/Gemfile.lock b/Gemfile.lock index a256ad56c..cc7bc9cd6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -758,7 +758,7 @@ GEM websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) - will_paginate (3.1.6) + will_paginate (3.1.7) xpath (3.2.0) nokogiri (~> 1.8) yard (0.9.16) @@ -905,7 +905,7 @@ DEPENDENCIES uuid (= 2.3.9) versionist (= 1.7.0) webmock (= 3.4.2) - will_paginate (= 3.1.6) + will_paginate (= 3.1.7) BUNDLED WITH 1.17.3 From 7ae2dc62494a729c45dc673cea4ee644e59ebd6e Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 01:20:00 +0100 Subject: [PATCH 24/33] Bump asset_sync --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 327adc13c..9c7a0e1ba 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.5.0", require: false + gem "asset_sync", "2.7.0", require: false end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index cc7bc9cd6..f2e25f372 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.5.0) + asset_sync (2.7.0) activemodel (>= 4.1.0) fog-core mime-types (>= 2.99) @@ -772,7 +772,7 @@ DEPENDENCIES acts-as-taggable-on (= 6.0.0) acts_as_api (= 1.0.1) addressable (= 2.5.2) - asset_sync (= 2.5.0) + asset_sync (= 2.7.0) autoprefixer-rails (= 8.6.5) bootstrap-sass (= 3.4.1) bootstrap-switch-rails (= 3.3.3) From 01468c34ddd844d84cf9ff7c23b0f591013c0a95 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 01:22:42 +0100 Subject: [PATCH 25/33] Bump rb-inotify --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 9c7a0e1ba..32a79f90d 100644 --- a/Gemfile +++ b/Gemfile @@ -243,7 +243,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.3", require: false - gem "rb-inotify", "0.9.10", require: false + gem "rb-inotify", "0.10.0", require: false # Linters gem "haml_lint", "0.28.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index f2e25f372..4a6807cf0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -224,7 +224,7 @@ GEM http-cookie (~> 1.0.0) faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) - ffi (1.9.25) + ffi (1.10.0) fixture_builder (0.5.2.rc3) activerecord (>= 2) activesupport (>= 2) @@ -586,8 +586,8 @@ GEM raindrops (0.19.0) rake (12.3.2) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) + rb-inotify (0.10.0) + ffi (~> 1.0) redcarpet (3.4.0) redis (3.3.5) regexp_parser (1.3.0) @@ -872,7 +872,7 @@ DEPENDENCIES rails-i18n (= 5.1.3) rails-timeago (= 2.17.1) rb-fsevent (= 0.10.3) - rb-inotify (= 0.9.10) + rb-inotify (= 0.10.0) redcarpet (= 3.4.0) redis (= 3.3.5) responders (= 2.4.1) From 18d7b3803725ce672d9cc7f0b06fb5b3de9438d2 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 01:41:51 +0100 Subject: [PATCH 26/33] Bump rubocop --- Gemfile | 2 +- Gemfile.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 32a79f90d..719399de1 100644 --- a/Gemfile +++ b/Gemfile @@ -252,7 +252,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.60.0", require: false + gem "rubocop", "0.66.0", require: false # Preloading environment diff --git a/Gemfile.lock b/Gemfile.lock index 4a6807cf0..8724cab3c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -322,7 +322,7 @@ GEM i18n-inflector (~> 2.6) railties (>= 3.0.0) ipaddress (0.8.3) - jaro_winkler (1.5.1) + jaro_winkler (1.5.2) jasmine (3.3.0) jasmine-core (~> 3.3.0) phantomjs @@ -444,8 +444,8 @@ GEM validate_url webfinger (>= 1.0.1) orm_adapter (0.5.0) - parallel (1.12.1) - parser (2.5.3.0) + parallel (1.14.0) + parser (2.6.2.0) ast (~> 2.4.0) pg (1.1.4) phantomjs (2.1.1.0) @@ -453,7 +453,6 @@ GEM capybara (>= 2.1, < 4) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) - powerpack (0.1.2) pronto (0.9.5) gitlab (~> 4.0, >= 4.0.0) httparty (>= 0.13.7) @@ -479,6 +478,7 @@ GEM pry-byebug (3.6.0) byebug (~> 10.0) pry (~> 0.10) + psych (3.1.0) public_suffix (3.0.3) raabro (1.1.6) rack (2.0.6) @@ -618,14 +618,14 @@ GEM rspec-mocks (~> 3.8.0) rspec-support (~> 3.8.0) rspec-support (3.8.0) - rubocop (0.60.0) + rubocop (0.66.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) - powerpack (~> 0.1) + psych (>= 3.1.0) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.4.0) + unicode-display_width (>= 1.4.0, < 1.6) ruby-oembed (0.12.0) ruby-progressbar (1.10.0) ruby_dep (1.5.0) @@ -726,7 +726,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.5) - unicode-display_width (1.4.0) + unicode-display_width (1.5.0) unicorn (5.5.0) kgio (~> 2.6) raindrops (~> 0.7) @@ -878,7 +878,7 @@ DEPENDENCIES responders (= 2.4.1) rspec-json_expectations (~> 2.1) rspec-rails (= 3.8.1) - rubocop (= 0.60.0) + rubocop (= 0.66.0) ruby-oembed (= 0.12.0) rubyzip (= 1.2.2) sass-rails (= 5.0.7) From 48c4cabd3fa20b23ffc2b15d077f60eb056eae1c Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 01:44:35 +0100 Subject: [PATCH 27/33] Bump byebug --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8724cab3c..8667fc859 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,7 +72,7 @@ GEM bootstrap-switch-rails (3.3.3) buftok (0.2.0) builder (3.2.3) - byebug (10.0.2) + byebug (11.0.1) capybara (3.11.1) addressable mini_mime (>= 0.1.3) @@ -475,8 +475,8 @@ GEM pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) - pry-byebug (3.6.0) - byebug (~> 10.0) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) psych (3.1.0) public_suffix (3.0.3) From 290ddbf271cf57a8280320e0730bf7807c751dbc Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 01:48:43 +0100 Subject: [PATCH 28/33] Bump capybara --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 719399de1..e84493bd5 100644 --- a/Gemfile +++ b/Gemfile @@ -280,7 +280,7 @@ group :test do # Cucumber (integration tests) - gem "capybara", "3.11.1" + gem "capybara", "3.15.0" gem "database_cleaner", "1.7.0" gem "poltergeist", "1.18.1" diff --git a/Gemfile.lock b/Gemfile.lock index 8667fc859..01a5af930 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,7 +73,7 @@ GEM buftok (0.2.0) builder (3.2.3) byebug (11.0.1) - capybara (3.11.1) + capybara (3.15.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -776,7 +776,7 @@ DEPENDENCIES autoprefixer-rails (= 8.6.5) bootstrap-sass (= 3.4.1) bootstrap-switch-rails (= 3.3.3) - capybara (= 3.11.1) + capybara (= 3.15.0) carrierwave (= 1.3.1) compass-rails (= 3.1.0) configurate (= 0.3.1) From f8419b14ba160fd4d3db4f1c76f4f00c981f026f Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 01:51:54 +0100 Subject: [PATCH 29/33] Bump shoulda-matchers --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index e84493bd5..cc7ba665b 100644 --- a/Gemfile +++ b/Gemfile @@ -289,7 +289,7 @@ group :test do # General helpers gem "factory_girl_rails", "4.8.0" - gem "shoulda-matchers", "3.1.2" + gem "shoulda-matchers", "4.0.1" gem "timecop", "0.9.1" gem "webmock", "3.4.2", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 01a5af930..801d90d60 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -650,8 +650,8 @@ GEM sass (~> 3.4.20) secure_headers (6.1.0) shellany (0.0.1) - shoulda-matchers (3.1.2) - activesupport (>= 4.0.0) + shoulda-matchers (4.0.1) + activesupport (>= 4.2.0) sidekiq (5.2.5) connection_pool (~> 2.2, >= 2.2.2) rack (>= 1.5.0) @@ -883,7 +883,7 @@ DEPENDENCIES rubyzip (= 1.2.2) sass-rails (= 5.0.7) secure_headers (= 6.1.0) - shoulda-matchers (= 3.1.2) + shoulda-matchers (= 4.0.1) sidekiq (= 5.2.5) sidekiq-cron (= 1.1.0) simple_captcha2 (= 0.4.3) From d9d0eb1512f550725af3196b6b3731e666e9faab Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 01:53:22 +0100 Subject: [PATCH 30/33] Bump webmock --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index cc7ba665b..d0816a507 100644 --- a/Gemfile +++ b/Gemfile @@ -291,7 +291,7 @@ group :test do gem "factory_girl_rails", "4.8.0" gem "shoulda-matchers", "4.0.1" gem "timecop", "0.9.1" - gem "webmock", "3.4.2", require: false + gem "webmock", "3.5.1", require: false gem "diaspora_federation-test", "0.2.5" diff --git a/Gemfile.lock b/Gemfile.lock index 801d90d60..48506d2d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -297,7 +297,7 @@ GEM execjs (~> 2.0) sprockets (>= 2.0.0) tilt (>= 1.2) - hashdiff (0.3.7) + hashdiff (0.3.8) hashie (3.6.0) http (3.3.0) addressable (~> 2.3) @@ -631,7 +631,7 @@ GEM ruby_dep (1.5.0) rubyzip (1.2.2) rugged (0.27.5) - safe_yaml (1.0.4) + safe_yaml (1.0.5) sass (3.4.25) sass-rails (5.0.7) railties (>= 4.0.0, < 6) @@ -751,7 +751,7 @@ GEM webfinger (1.1.0) activesupport httpclient (>= 2.4) - webmock (3.4.2) + webmock (3.5.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -904,7 +904,7 @@ DEPENDENCIES unicorn-worker-killer (= 0.4.4) uuid (= 2.3.9) versionist (= 1.7.0) - webmock (= 3.4.2) + webmock (= 3.5.1) will_paginate (= 3.1.7) BUNDLED WITH From ccbc65993dc94a969630d205085600d1d23eac92 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 01:55:39 +0100 Subject: [PATCH 31/33] Bump rspec-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index d0816a507..74f41e040 100644 --- a/Gemfile +++ b/Gemfile @@ -301,7 +301,7 @@ end group :development, :test do # RSpec (unit tests, some integration tests) - gem "rspec-rails", "3.8.1" + gem "rspec-rails", "3.8.2" # Cucumber (integration tests) gem "cucumber-rails", "1.6.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 48506d2d1..90be6c40a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -609,7 +609,7 @@ GEM rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) - rspec-rails (3.8.1) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -877,7 +877,7 @@ DEPENDENCIES redis (= 3.3.5) responders (= 2.4.1) rspec-json_expectations (~> 2.1) - rspec-rails (= 3.8.1) + rspec-rails (= 3.8.2) rubocop (= 0.66.0) ruby-oembed (= 0.12.0) rubyzip (= 1.2.2) From 093cca9a76479a27b557b1b351b0503752960321 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 01:58:26 +0100 Subject: [PATCH 32/33] Bump rails-controller-testing --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 74f41e040..f47b36ee2 100644 --- a/Gemfile +++ b/Gemfile @@ -313,5 +313,5 @@ group :development, :test do gem "sinon-rails", "1.15.0" # For `assigns` in controller specs - gem "rails-controller-testing", "1.0.2" + gem "rails-controller-testing", "1.0.4" end diff --git a/Gemfile.lock b/Gemfile.lock index 90be6c40a..f41f4939c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -560,10 +560,10 @@ GEM rails-assets-markdown-it-sup (1.0.0) 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) - actionview (~> 5.x, >= 5.0.1) - activesupport (~> 5.x) + rails-controller-testing (1.0.4) + actionpack (>= 5.0.1.x) + actionview (>= 5.0.1.x) + activesupport (>= 5.0.1.x) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -868,7 +868,7 @@ DEPENDENCIES rails-assets-markdown-it-sub (= 1.0.0)! rails-assets-markdown-it-sup (= 1.0.0)! rails-assets-utatti-perfect-scrollbar (= 1.4.0)! - rails-controller-testing (= 1.0.2) + rails-controller-testing (= 1.0.4) rails-i18n (= 5.1.3) rails-timeago (= 2.17.1) rb-fsevent (= 0.10.3) From a28be72e74d34c328f2b90305a610e580803a127 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 24 Mar 2019 02:04:16 +0100 Subject: [PATCH 33/33] Bump other dependency gems --- Gemfile.lock | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f41f4939c..a1bd39555 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -63,7 +63,7 @@ GEM attr_required (1.0.1) autoprefixer-rails (8.6.5) execjs - backports (3.11.4) + backports (3.12.0) bcrypt (3.1.12) bindata (2.4.4) bootstrap-sass (3.4.1) @@ -85,7 +85,7 @@ GEM activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - celluloid (0.17.3) + celluloid (0.17.4) celluloid-essentials celluloid-extras celluloid-fsm @@ -106,7 +106,7 @@ GEM timers (>= 4.1.1) celluloid-supervision (0.20.6) timers (>= 4.1.1) - chunky_png (1.3.10) + chunky_png (1.3.11) cliver (0.3.2) coderay (1.1.2) compass (1.0.3) @@ -201,7 +201,7 @@ GEM rake et-orbi (1.1.7) tzinfo - ethon (0.11.0) + ethon (0.12.0) ffi (>= 1.3.0) excon (0.62.0) execjs (2.7.0) @@ -254,9 +254,9 @@ GEM ruby-progressbar (~> 1.4) get_process_mem (0.2.3) gherkin (5.1.0) - gitlab (4.7.0) - httparty (>= 0.14.0) - terminal-table (>= 1.5.1) + gitlab (4.10.0) + httparty (~> 0.14, >= 0.14.0) + terminal-table (~> 1.5, >= 1.5.1) globalid (0.4.2) activesupport (>= 4.2.0) gon (6.2.1) @@ -309,7 +309,7 @@ GEM http-form_data (2.1.1) http_accept_language (2.1.1) http_parser.rb (0.6.0) - httparty (0.16.3) + httparty (0.16.4) mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) @@ -341,8 +341,8 @@ GEM rails (>= 4.0, < 6.0) sprockets (>= 3.0.0) json (2.2.0) - json-jwt (1.9.4) - activesupport + json-jwt (1.10.0) + activesupport (>= 4.2) aes_key_wrap bindata json-schema (2.8.1) @@ -350,12 +350,12 @@ GEM json-schema-rspec (0.0.4) json-schema (~> 2.5) rspec - jsonpath (0.9.6) + jsonpath (1.0.1) multi_json to_regexp (~> 0.2.1) jwt (2.1.0) kgio (2.11.2) - kostya-sigar (2.0.4) + kostya-sigar (2.0.6) leaflet-rails (1.3.1) rails (>= 4.2.0) listen (3.1.5) @@ -419,9 +419,9 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.5.0) + omniauth-oauth2 (1.6.0) oauth2 (~> 1.1) - omniauth (~> 1.2) + omniauth (~> 1.9) omniauth-tumblr (1.2) multi_json omniauth-oauth (~> 1.0) @@ -630,7 +630,7 @@ GEM ruby-progressbar (1.10.0) ruby_dep (1.5.0) rubyzip (1.2.2) - rugged (0.27.5) + rugged (0.28.1) safe_yaml (1.0.5) sass (3.4.25) sass-rails (5.0.7) @@ -692,7 +692,7 @@ GEM sysexits (1.2.0) systemu (2.6.5) temple (0.8.1) - term-ansicolor (1.7.0) + term-ansicolor (1.7.1) tins (~> 1.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) @@ -700,7 +700,7 @@ GEM thread_safe (0.3.6) tilt (2.0.9) timecop (0.9.1) - timers (4.2.0) + timers (4.3.0) tins (1.20.2) to_regexp (0.2.1) turbo_dev_assets (0.0.2) @@ -739,9 +739,9 @@ GEM validate_email (0.1.6) activemodel (>= 3.0) mail (>= 2.2.5) - validate_url (1.0.2) + validate_url (1.0.6) activemodel (>= 3.0.0) - addressable + public_suffix versionist (1.7.0) activesupport (>= 3) railties (>= 3) @@ -761,7 +761,7 @@ GEM will_paginate (3.1.7) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.16) + yard (0.9.18) PLATFORMS ruby