From 5ee69f412a5a21f59096fd75a2a4acc6295752d2 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 7 Apr 2018 22:15:34 +0200 Subject: [PATCH 01/55] Bump rails --- Gemfile | 2 +- Gemfile.lock | 90 ++++++++++++++++++++++++++-------------------------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/Gemfile b/Gemfile index 5247667a4..658fb76c1 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "rails", "5.1.4" +gem "rails", "5.1.6" # Legacy Rails features, remove me! # responders (class level) diff --git a/Gemfile.lock b/Gemfile.lock index f3d5c2bfd..7dee030be 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.4) - actionpack (= 5.1.4) + actioncable (5.1.6) + actionpack (= 5.1.6) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.4) - actionpack (= 5.1.4) - actionview (= 5.1.4) - activejob (= 5.1.4) + actionmailer (5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.4) - actionview (= 5.1.4) - activesupport (= 5.1.4) + actionpack (5.1.6) + actionview (= 5.1.6) + activesupport (= 5.1.6) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.4) - activesupport (= 5.1.4) + actionview (5.1.6) + activesupport (= 5.1.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -28,20 +28,20 @@ GEM active_model_serializers (0.9.7) activemodel (>= 3.2) concurrent-ruby (~> 1.0) - activejob (5.1.4) - activesupport (= 5.1.4) + activejob (5.1.6) + activesupport (= 5.1.6) globalid (>= 0.3.6) - activemodel (5.1.4) - activesupport (= 5.1.4) - activerecord (5.1.4) - activemodel (= 5.1.4) - activesupport (= 5.1.4) + activemodel (5.1.6) + activesupport (= 5.1.6) + activerecord (5.1.6) + activemodel (= 5.1.6) + activesupport (= 5.1.6) arel (~> 8.0) activerecord-import (0.20.1) activerecord (>= 3.2) - activesupport (5.1.4) + activesupport (5.1.6) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) + i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) acts-as-taggable-on (5.0.0) @@ -245,7 +245,7 @@ GEM gitlab (4.2.0) httparty terminal-table - globalid (0.4.0) + globalid (0.4.1) activesupport (>= 4.2.0) gon (6.1.0) actionpack (>= 3.0) @@ -306,7 +306,7 @@ GEM httparty (0.15.6) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (0.9.5) + i18n (1.0.0) concurrent-ruby (~> 1.0) i18n-inflector (2.6.7) i18n (>= 0.4.1) @@ -360,14 +360,14 @@ GEM multi_json (~> 1.10) logging-rails (0.6.0) logging (>= 1.8) - loofah (2.2.0) + loofah (2.2.2) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.12) macaddr (1.7.1) systemu (~> 2.6.2) - mail (2.6.6) - mime-types (>= 1.16, < 4) + mail (2.7.0) + mini_mime (>= 0.1.1) markdown-it-html5-embed (1.0.0) markerb (1.1.0) memoizable (0.4.2) @@ -390,7 +390,7 @@ GEM mysql2 (0.4.10) naught (1.1.0) nenv (0.3.0) - nio4r (2.1.0) + nio4r (2.3.0) nokogiri (1.8.2) mini_portile2 (~> 2.3.0) notiffany (0.1.1) @@ -494,19 +494,19 @@ GEM rack-rewrite (1.5.1) rack-ssl (1.4.1) rack - rack-test (0.8.3) + rack-test (1.0.0) rack (>= 1.0, < 3) - rails (5.1.4) - actioncable (= 5.1.4) - actionmailer (= 5.1.4) - actionpack (= 5.1.4) - actionview (= 5.1.4) - activejob (= 5.1.4) - activemodel (= 5.1.4) - activerecord (= 5.1.4) - activesupport (= 5.1.4) + 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) bundler (>= 1.3.0) - railties (= 5.1.4) + railties (= 5.1.6) sprockets-rails (>= 2.0.0) rails-assets-autosize (4.0.0) rails-assets-backbone (1.3.3) @@ -561,24 +561,24 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) rails-i18n (5.1.1) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) rails-timeago (2.16.0) actionpack (>= 3.1) activesupport (>= 3.1) - railties (5.1.4) - actionpack (= 5.1.4) - activesupport (= 5.1.4) + railties (5.1.6) + actionpack (= 5.1.6) + activesupport (= 5.1.6) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake raindrops (0.19.0) - rake (12.3.0) + rake (12.3.1) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) @@ -755,7 +755,7 @@ GEM hashdiff websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) + websocket-extensions (0.1.3) will_paginate (3.1.6) xpath (2.1.0) nokogiri (~> 1.3) @@ -845,7 +845,7 @@ DEPENDENCIES rack-piwik (= 0.3.0) rack-rewrite (= 1.5.1) rack-ssl (= 1.4.1) - rails (= 5.1.4) + rails (= 5.1.6) rails-assets-autosize (= 4.0.0)! rails-assets-backbone (= 1.3.3)! rails-assets-blueimp-gallery (= 2.27.0)! From 85e95437d8327f009f85066de26ceeba16ebb3e3 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 7 Apr 2018 22:20:21 +0200 Subject: [PATCH 02/55] Bump unicorn --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 658fb76c1..d4192afa2 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ gem "responders", "2.4.0" # Appserver -gem "unicorn", "5.3.0", require: false +gem "unicorn", "5.4.0", require: false gem "unicorn-worker-killer", "0.4.4" # Federation diff --git a/Gemfile.lock b/Gemfile.lock index 7dee030be..841cd52c4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -347,7 +347,7 @@ GEM jsonpath (0.8.7) multi_json jwt (1.5.6) - kgio (2.11.0) + kgio (2.11.2) leaflet-rails (1.2.0) rails (>= 4.2.0) listen (3.1.5) @@ -722,7 +722,7 @@ GEM unf_ext unf_ext (0.0.7.4) unicode-display_width (1.3.0) - unicorn (5.3.0) + unicorn (5.4.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.0) uglifier (= 3.2.0) - unicorn (= 5.3.0) + unicorn (= 5.4.0) unicorn-worker-killer (= 0.4.4) uuid (= 2.3.8) versionist (= 1.6.0) From a55654b7eeed54d5133dee4c515caffa6a9ae0a7 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 7 Apr 2018 22:22:24 +0200 Subject: [PATCH 03/55] Bump devise --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index d4192afa2..c35047239 100644 --- a/Gemfile +++ b/Gemfile @@ -26,7 +26,7 @@ gem "json-schema", "2.8.0" # Authentication -gem "devise", "4.4.1" +gem "devise", "4.4.3" gem "devise_lastseenable", "0.0.6" # Captcha diff --git a/Gemfile.lock b/Gemfile.lock index 841cd52c4..0e262532e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -156,10 +156,10 @@ GEM railties (>= 4, < 5.2) cucumber-wire (0.0.1) database_cleaner (1.6.1) - devise (4.4.1) + devise (4.4.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.2) + railties (>= 4.1.0, < 6.0) responders warden (~> 1.2.3) devise_lastseenable (0.0.6) @@ -782,7 +782,7 @@ DEPENDENCIES cucumber-api-steps (= 0.13) cucumber-rails (= 1.5.0) database_cleaner (= 1.6.1) - devise (= 4.4.1) + devise (= 4.4.3) devise_lastseenable (= 0.0.6) diaspora-prosody-config (= 0.0.7) diaspora_federation-json_schema (= 0.2.4) From 1e8f404b653bb2347fcc4a5c0472baa12c077323 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 7 Apr 2018 22:26:12 +0200 Subject: [PATCH 04/55] Bump sidekiq --- Gemfile | 3 ++- Gemfile.lock | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index c35047239..b0f0018fc 100644 --- a/Gemfile +++ b/Gemfile @@ -35,7 +35,8 @@ gem "simple_captcha2", "0.4.3", require: "simple_captcha" # Background processing -gem "sidekiq", "5.0.4" +gem "redis", "3.3.5" # Pinned to 3.3.x because of https://github.com/antirez/redis/issues/4272 +gem "sidekiq", "5.1.3" # Scheduled processing diff --git a/Gemfile.lock b/Gemfile.lock index 0e262532e..b5169dce3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -583,7 +583,7 @@ GEM rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) redcarpet (3.4.0) - redis (3.3.3) + redis (3.3.5) request_store (1.3.2) responders (2.4.0) actionpack (>= 4.2.0, < 5.3) @@ -644,11 +644,11 @@ GEM shellany (0.0.1) shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.0.4) + sidekiq (5.1.3) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) - redis (~> 3.3, >= 3.3.3) + redis (>= 3.3.5, < 5) sidekiq-cron (0.6.3) rufus-scheduler (>= 3.3.0) sidekiq (>= 4.2.1) @@ -874,6 +874,7 @@ DEPENDENCIES rb-fsevent (= 0.10.2) rb-inotify (= 0.9.10) redcarpet (= 3.4.0) + redis (= 3.3.5) responders (= 2.4.0) rspec-json_expectations (~> 2.1) rspec-rails (= 3.6.1) @@ -883,7 +884,7 @@ DEPENDENCIES sass-rails (= 5.0.6) secure_headers (= 3.7.1) shoulda-matchers (= 3.1.2) - sidekiq (= 5.0.4) + sidekiq (= 5.1.3) sidekiq-cron (= 0.6.3) simple_captcha2 (= 0.4.3) simplecov (= 0.14.1) From 94b59f29b09d753155a713b2e6573a849d918c53 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 7 Apr 2018 22:59:52 +0200 Subject: [PATCH 05/55] Bump uglifier --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index b0f0018fc..c8745b6eb 100644 --- a/Gemfile +++ b/Gemfile @@ -44,7 +44,7 @@ gem "sidekiq-cron", "0.6.3" # Compression -gem "uglifier", "3.2.0" +gem "uglifier", "4.1.8" # Configuration diff --git a/Gemfile.lock b/Gemfile.lock index b5169dce3..3aad9f133 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -716,7 +716,7 @@ GEM ethon (>= 0.9.0) tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (3.2.0) + uglifier (4.1.8) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext @@ -899,7 +899,7 @@ DEPENDENCIES twitter (= 6.1.0) twitter-text (= 1.14.7) typhoeus (= 1.3.0) - uglifier (= 3.2.0) + uglifier (= 4.1.8) unicorn (= 5.4.0) unicorn-worker-killer (= 0.4.4) uuid (= 2.3.8) From 264a64596c8b0db69b136e5cee88942985979379 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 7 Apr 2018 23:05:07 +0200 Subject: [PATCH 06/55] Bump rack-cors --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index c8745b6eb..074c1f432 100644 --- a/Gemfile +++ b/Gemfile @@ -52,7 +52,7 @@ gem "configurate", "0.3.1" # Cross-origin resource sharing -gem "rack-cors", "1.0.1", require: "rack/cors" +gem "rack-cors", "1.0.2", require: "rack/cors" # CSS diff --git a/Gemfile.lock b/Gemfile.lock index 3aad9f133..b13ca221a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -476,7 +476,7 @@ GEM pry (~> 0.10) public_suffix (3.0.0) rack (2.0.4) - rack-cors (1.0.1) + rack-cors (1.0.2) rack-google-analytics (1.2.0) actionpack activesupport @@ -840,7 +840,7 @@ DEPENDENCIES pronto-scss (= 0.9.1) pry pry-byebug - rack-cors (= 1.0.1) + rack-cors (= 1.0.2) rack-google-analytics (= 1.2.0) rack-piwik (= 0.3.0) rack-rewrite (= 1.5.1) From d31da2e58e0054311567c9e98f841c1399282ff4 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 7 Apr 2018 23:05:56 +0200 Subject: [PATCH 07/55] Bump autoprefixer-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 074c1f432..e0e12eea7 100644 --- a/Gemfile +++ b/Gemfile @@ -56,7 +56,7 @@ gem "rack-cors", "1.0.2", require: "rack/cors" # CSS -gem "autoprefixer-rails", "7.1.4.1" +gem "autoprefixer-rails", "8.2.0" 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 b13ca221a..a8b8e1d93 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -60,7 +60,7 @@ GEM unf ast (2.3.0) attr_required (1.0.1) - autoprefixer-rails (7.1.4.1) + autoprefixer-rails (8.2.0) execjs bcrypt (3.1.11) bindata (2.4.1) @@ -771,7 +771,7 @@ DEPENDENCIES acts_as_api (= 1.0.1) addressable (= 2.5.2) asset_sync (= 2.2.0) - autoprefixer-rails (= 7.1.4.1) + autoprefixer-rails (= 8.2.0) bootstrap-sass (= 3.3.7) bootstrap-switch-rails (= 3.3.3) capybara (= 2.15.1) From 54bdd32b86e6bdcf51406c4949d4132c8e7372bf Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 7 Apr 2018 23:08:40 +0200 Subject: [PATCH 08/55] Bump sass-rails --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index e0e12eea7..1faa5d1f2 100644 --- a/Gemfile +++ b/Gemfile @@ -60,7 +60,7 @@ gem "autoprefixer-rails", "8.2.0" gem "bootstrap-sass", "3.3.7" gem "bootstrap-switch-rails", "3.3.3" gem "compass-rails", "3.0.2" -gem "sass-rails", "5.0.6" +gem "sass-rails", "5.0.7" gem "sprockets-rails", "3.2.1" # Database diff --git a/Gemfile.lock b/Gemfile.lock index a8b8e1d93..42f6c58ba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -626,7 +626,7 @@ GEM rugged (0.26.0) safe_yaml (1.0.4) sass (3.4.25) - sass-rails (5.0.6) + sass-rails (5.0.7) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) @@ -881,7 +881,7 @@ DEPENDENCIES rubocop (= 0.50.0) ruby-oembed (= 0.12.0) rubyzip (= 1.2.1) - sass-rails (= 5.0.6) + sass-rails (= 5.0.7) secure_headers (= 3.7.1) shoulda-matchers (= 3.1.2) sidekiq (= 5.1.3) From 53b3e395e055e3b319cedc11c3a2dd4e963011bd Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 7 Apr 2018 23:12:49 +0200 Subject: [PATCH 09/55] Bump mysql2 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 1faa5d1f2..bc2a7208d 100644 --- a/Gemfile +++ b/Gemfile @@ -66,7 +66,7 @@ gem "sprockets-rails", "3.2.1" # Database group :mysql, optional: true do - gem "mysql2", "0.4.10" + gem "mysql2", "0.5.0" end group :postgresql, optional: true do gem "pg", "0.21.0" diff --git a/Gemfile.lock b/Gemfile.lock index 42f6c58ba..05e7590c7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -387,7 +387,7 @@ GEM multi_test (0.1.2) multi_xml (0.6.0) multipart-post (2.0.0) - mysql2 (0.4.10) + mysql2 (0.5.0) naught (1.1.0) nenv (0.3.0) nio4r (2.3.0) @@ -822,7 +822,7 @@ DEPENDENCIES mini_magick (= 4.8.0) minitest mobile-fu (= 1.4.0) - mysql2 (= 0.4.10) + mysql2 (= 0.5.0) nokogiri (= 1.8.2) omniauth (= 1.6.1) omniauth-facebook (= 4.0.0) From 1359c7a9e8b1309c4b4d10acb771cb525d2ffca0 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 7 Apr 2018 23:14:12 +0200 Subject: [PATCH 10/55] Bump pg --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index bc2a7208d..45ec01c77 100644 --- a/Gemfile +++ b/Gemfile @@ -69,7 +69,7 @@ group :mysql, optional: true do gem "mysql2", "0.5.0" end group :postgresql, optional: true do - gem "pg", "0.21.0" + gem "pg", "1.0.0" end diff --git a/Gemfile.lock b/Gemfile.lock index 05e7590c7..d316a956e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -442,7 +442,7 @@ GEM parallel (1.12.0) parser (2.4.0.0) ast (~> 2.2) - pg (0.21.0) + pg (1.0.0) phantomjs (2.1.1.0) poltergeist (1.16.0) capybara (~> 2.1) @@ -831,7 +831,7 @@ DEPENDENCIES omniauth-wordpress (= 0.2.2) open_graph_reader (= 0.6.2) openid_connect (= 1.1.3) - pg (= 0.21.0) + pg (= 1.0.0) poltergeist (= 1.16.0) pronto (= 0.9.5) pronto-eslint (= 0.9.1) From 312f3e425924cbb32f922b3d91ed899ab9354d8a Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 7 Apr 2018 23:16:13 +0200 Subject: [PATCH 11/55] Bump activerecord-import --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 45ec01c77..1e917b44b 100644 --- a/Gemfile +++ b/Gemfile @@ -73,7 +73,7 @@ group :postgresql, optional: true do end -gem "activerecord-import", "0.20.1" +gem "activerecord-import", "0.22.0" # File uploading diff --git a/Gemfile.lock b/Gemfile.lock index d316a956e..f4aed0be5 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.20.1) + activerecord-import (0.22.0) activerecord (>= 3.2) activesupport (5.1.6) concurrent-ruby (~> 1.0, >= 1.0.2) @@ -766,7 +766,7 @@ PLATFORMS DEPENDENCIES active_model_serializers (= 0.9.7) - activerecord-import (= 0.20.1) + activerecord-import (= 0.22.0) acts-as-taggable-on (= 5.0.0) acts_as_api (= 1.0.1) addressable (= 2.5.2) From 47c99207f43400375c09254cf59895ba99ace50a Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 7 Apr 2018 23:17:21 +0200 Subject: [PATCH 12/55] Bump carrierwave --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 1e917b44b..b5c85450f 100644 --- a/Gemfile +++ b/Gemfile @@ -77,7 +77,7 @@ gem "activerecord-import", "0.22.0" # File uploading -gem "carrierwave", "1.1.0" +gem "carrierwave", "1.2.2" gem "fog-aws", "1.4.1" gem "mini_magick", "4.8.0" diff --git a/Gemfile.lock b/Gemfile.lock index f4aed0be5..cd009881e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -78,7 +78,7 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - carrierwave (1.1.0) + carrierwave (1.2.2) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) @@ -775,7 +775,7 @@ DEPENDENCIES bootstrap-sass (= 3.3.7) bootstrap-switch-rails (= 3.3.3) capybara (= 2.15.1) - carrierwave (= 1.1.0) + carrierwave (= 1.2.2) compass-rails (= 3.0.2) configurate (= 0.3.1) coveralls (= 0.8.21) From d1ab3cf4e47aaaa5b127dffa5887ec0488cc443a Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 7 Apr 2018 23:19:35 +0200 Subject: [PATCH 13/55] Bump fog-aws --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index b5c85450f..358da6cd1 100644 --- a/Gemfile +++ b/Gemfile @@ -78,7 +78,7 @@ gem "activerecord-import", "0.22.0" # File uploading gem "carrierwave", "1.2.2" -gem "fog-aws", "1.4.1" +gem "fog-aws", "2.0.1" gem "mini_magick", "4.8.0" # GUID generation diff --git a/Gemfile.lock b/Gemfile.lock index cd009881e..b18bfbba6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -196,7 +196,7 @@ GEM tzinfo ethon (0.11.0) ffi (>= 1.3.0) - excon (0.59.0) + excon (0.62.0) execjs (2.7.0) eye (0.9.2) celluloid (~> 0.17.3) @@ -221,7 +221,7 @@ GEM fixture_builder (0.5.0) activerecord (>= 2) activesupport (>= 2) - fog-aws (1.4.1) + fog-aws (2.0.1) fog-core (~> 1.38) fog-json (~> 1.0) fog-xml (~> 0.1) @@ -383,7 +383,7 @@ GEM mobile-fu (1.4.0) rack-mobile-detect rails - multi_json (1.12.2) + multi_json (1.13.1) multi_test (0.1.2) multi_xml (0.6.0) multipart-post (2.0.0) @@ -795,7 +795,7 @@ DEPENDENCIES faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.12.2) fixture_builder (= 0.5.0) - fog-aws (= 1.4.1) + fog-aws (= 2.0.1) fuubar (= 2.2.0) gon (= 6.1.0) guard (= 2.14.1) From 8cfe16d3b4c136e40612e1d802280427f5ede942 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 7 Apr 2018 23:23:10 +0200 Subject: [PATCH 14/55] Bump js-routes --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 358da6cd1..34ab63db2 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.1" -gem "js-routes", "1.4.1" +gem "js-routes", "1.4.3" gem "js_image_paths", "0.1.1" source "https://rails-assets.org" do diff --git a/Gemfile.lock b/Gemfile.lock index b18bfbba6..54f97c0f8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -326,7 +326,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - js-routes (1.4.1) + js-routes (1.4.3) railties (>= 3.2) sprockets-rails js_image_paths (0.1.1) @@ -810,7 +810,7 @@ DEPENDENCIES jasmine (= 2.8.0) jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.3.1) - js-routes (= 1.4.1) + js-routes (= 1.4.3) js_image_paths (= 0.1.1) json (= 2.1.0) json-schema (= 2.8.0) From 92363dc08889e630fdc1e3c82990322592286bdd Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 7 Apr 2018 23:37:03 +0200 Subject: [PATCH 15/55] Bump rails-assets-markdown-it --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 34ab63db2..ed3d82e85 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.0" + gem "rails-assets-markdown-it", "8.4.1" gem "rails-assets-markdown-it-hashtag", "0.4.0" gem "rails-assets-markdown-it-diaspora-mention", "1.2.0" gem "rails-assets-markdown-it-sanitizer", "0.4.3" diff --git a/Gemfile.lock b/Gemfile.lock index 54f97c0f8..10ff9bfdc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -546,7 +546,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.0) + rails-assets-markdown-it (8.4.1) rails-assets-markdown-it-diaspora-mention (1.2.0) rails-assets-markdown-it-hashtag (0.4.0) rails-assets-markdown-it-sanitizer (0.4.3) @@ -860,7 +860,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.0)! + rails-assets-markdown-it (= 8.4.1)! rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)! rails-assets-markdown-it-diaspora-mention (= 1.2.0)! rails-assets-markdown-it-hashtag (= 0.4.0)! From 42b316449c6b4aefe62145149e1945d6f3159a5e Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 7 Apr 2018 23:43:28 +0200 Subject: [PATCH 16/55] Bump rails-assets-corejs-typeahead --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index ed3d82e85..f2ae55980 100644 --- a/Gemfile +++ b/Gemfile @@ -110,7 +110,7 @@ source "https://rails-assets.org" do gem "rails-assets-backbone", "1.3.3" gem "rails-assets-bootstrap-markdown", "2.10.0" - gem "rails-assets-corejs-typeahead", "1.1.1" + gem "rails-assets-corejs-typeahead", "1.2.1" gem "rails-assets-fine-uploader", "5.13.0" # jQuery plugins diff --git a/Gemfile.lock b/Gemfile.lock index 10ff9bfdc..ea20f6963 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -516,7 +516,7 @@ GEM rails-assets-jquery (>= 1.9.1, < 4) rails-assets-bootstrap-markdown (2.10.0) rails-assets-bootstrap (~> 3) - rails-assets-corejs-typeahead (1.1.1) + rails-assets-corejs-typeahead (1.2.1) rails-assets-jquery (>= 1.11) rails-assets-diaspora_jsxc (0.1.5.develop.7) rails-assets-emojione (~> 2.0.1) @@ -850,7 +850,7 @@ DEPENDENCIES rails-assets-backbone (= 1.3.3)! rails-assets-blueimp-gallery (= 2.27.0)! rails-assets-bootstrap-markdown (= 2.10.0)! - rails-assets-corejs-typeahead (= 1.1.1)! + rails-assets-corejs-typeahead (= 1.2.1)! rails-assets-diaspora_jsxc (= 0.1.5.develop.7)! rails-assets-fine-uploader (= 5.13.0)! rails-assets-highlightjs (= 9.12.0)! From f894214aa9dfe4922f4b33e6ba186122b895179a Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 7 Apr 2018 23:49:17 +0200 Subject: [PATCH 17/55] Bump rails-assets-autosize --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index f2ae55980..d2f2d43c8 100644 --- a/Gemfile +++ b/Gemfile @@ -115,7 +115,7 @@ source "https://rails-assets.org" do # jQuery plugins - gem "rails-assets-autosize", "4.0.0" + gem "rails-assets-autosize", "4.0.1" gem "rails-assets-blueimp-gallery", "2.27.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 ea20f6963..18f205e23 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -508,7 +508,7 @@ GEM bundler (>= 1.3.0) railties (= 5.1.6) sprockets-rails (>= 2.0.0) - rails-assets-autosize (4.0.0) + rails-assets-autosize (4.0.1) rails-assets-backbone (1.3.3) rails-assets-underscore (>= 1.8.3) rails-assets-blueimp-gallery (2.27.0) @@ -846,7 +846,7 @@ DEPENDENCIES rack-rewrite (= 1.5.1) rack-ssl (= 1.4.1) rails (= 5.1.6) - rails-assets-autosize (= 4.0.0)! + rails-assets-autosize (= 4.0.1)! rails-assets-backbone (= 1.3.3)! rails-assets-blueimp-gallery (= 2.27.0)! rails-assets-bootstrap-markdown (= 2.10.0)! From 3e078643eaeb87150e1bbae8729957e43257fe6b Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 7 Apr 2018 23:51:00 +0200 Subject: [PATCH 18/55] Bump rails-assets-blueimp-gallery --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index d2f2d43c8..02085f1f9 100644 --- a/Gemfile +++ b/Gemfile @@ -116,7 +116,7 @@ source "https://rails-assets.org" do # jQuery plugins gem "rails-assets-autosize", "4.0.1" - gem "rails-assets-blueimp-gallery", "2.27.0" + 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" gem "rails-assets-jquery-textchange", "0.2.3" diff --git a/Gemfile.lock b/Gemfile.lock index 18f205e23..8b6181436 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -511,7 +511,7 @@ GEM rails-assets-autosize (4.0.1) rails-assets-backbone (1.3.3) rails-assets-underscore (>= 1.8.3) - rails-assets-blueimp-gallery (2.27.0) + rails-assets-blueimp-gallery (2.33.0) rails-assets-bootstrap (3.3.7) rails-assets-jquery (>= 1.9.1, < 4) rails-assets-bootstrap-markdown (2.10.0) @@ -848,7 +848,7 @@ DEPENDENCIES rails (= 5.1.6) rails-assets-autosize (= 4.0.1)! rails-assets-backbone (= 1.3.3)! - rails-assets-blueimp-gallery (= 2.27.0)! + rails-assets-blueimp-gallery (= 2.33.0)! rails-assets-bootstrap-markdown (= 2.10.0)! rails-assets-corejs-typeahead (= 1.2.1)! rails-assets-diaspora_jsxc (= 0.1.5.develop.7)! From 89cb8872905228af92b3910b5e4d7dc66c6b3a12 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 00:12:21 +0200 Subject: [PATCH 19/55] Bump leaflet-rails --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 02085f1f9..f559daca3 100644 --- a/Gemfile +++ b/Gemfile @@ -136,7 +136,7 @@ gem "rails-i18n", "5.1.1" gem "markerb", "1.1.0" # Map -gem "leaflet-rails", "1.2.0" +gem "leaflet-rails", "1.3.1" # Parsing diff --git a/Gemfile.lock b/Gemfile.lock index 8b6181436..36f1618f4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -348,7 +348,7 @@ GEM multi_json jwt (1.5.6) kgio (2.11.2) - leaflet-rails (1.2.0) + leaflet-rails (1.3.1) rails (>= 4.2.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) @@ -377,7 +377,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_magick (4.8.0) - mini_mime (0.1.4) + mini_mime (1.0.0) mini_portile2 (2.3.0) minitest (5.11.3) mobile-fu (1.4.0) @@ -815,7 +815,7 @@ DEPENDENCIES json (= 2.1.0) json-schema (= 2.8.0) json-schema-rspec (= 0.0.4) - leaflet-rails (= 1.2.0) + leaflet-rails (= 1.3.1) logging-rails (= 0.6.0) markdown-it-html5-embed (= 1.0.0) markerb (= 1.1.0) From 070e4caa5772685e0e53f123e87e2250fff23278 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 00:25:29 +0200 Subject: [PATCH 20/55] Bump twitter-text --- Gemfile | 2 +- Gemfile.lock | 8 +++++--- lib/diaspora/markdownify/html.rb | 2 +- lib/diaspora/message_renderer.rb | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index f559daca3..6b9d1c0e2 100644 --- a/Gemfile +++ b/Gemfile @@ -144,7 +144,7 @@ gem "nokogiri", "1.8.2" gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb gem "redcarpet", "3.4.0" gem "ruby-oembed", "0.12.0" -gem "twitter-text", "1.14.7" +gem "twitter-text", "2.1.0" # RTL support diff --git a/Gemfile.lock b/Gemfile.lock index 36f1618f4..5ef86d32c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -314,6 +314,7 @@ GEM actionpack (>= 3.0.0) i18n-inflector (~> 2.6) railties (>= 3.0.0) + idn-ruby (0.1.0) ipaddress (0.8.3) jasmine (2.8.0) jasmine-core (>= 2.8.0, < 3.0.0) @@ -710,7 +711,8 @@ GEM memoizable (~> 0.4.2) naught (~> 1.1) simple_oauth (~> 0.3.1) - twitter-text (1.14.7) + twitter-text (2.1.0) + idn-ruby unf (~> 0.1.0) typhoeus (1.3.0) ethon (>= 0.9.0) @@ -720,7 +722,7 @@ GEM execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.7.4) + unf_ext (0.0.7.5) unicode-display_width (1.3.0) unicorn (5.4.0) kgio (~> 2.6) @@ -897,7 +899,7 @@ DEPENDENCIES timecop (= 0.9.1) turbo_dev_assets (= 0.0.2) twitter (= 6.1.0) - twitter-text (= 1.14.7) + twitter-text (= 2.1.0) typhoeus (= 1.3.0) uglifier (= 4.1.8) unicorn (= 5.4.0) diff --git a/lib/diaspora/markdownify/html.rb b/lib/diaspora/markdownify/html.rb index 19d4dd649..610c45223 100644 --- a/lib/diaspora/markdownify/html.rb +++ b/lib/diaspora/markdownify/html.rb @@ -6,7 +6,7 @@ module Diaspora include ActionView::Helpers::TextHelper def autolink link, type - Twitter::Autolink.auto_link_urls( + Twitter::TwitterText::Autolink.auto_link_urls( link, url_target: "_blank", link_attribute_block: lambda {|_, attr| attr[:rel] += " noopener noreferrer" } diff --git a/lib/diaspora/message_renderer.rb b/lib/diaspora/message_renderer.rb index 4477ae587..883bcbaf6 100644 --- a/lib/diaspora/message_renderer.rb +++ b/lib/diaspora/message_renderer.rb @@ -244,7 +244,7 @@ module Diaspora # Extracts all the urls from the raw message and return them in the form of a string # Different URLs are seperated with a space def urls - @urls ||= Twitter::Extractor.extract_urls(plain_text_without_markdown).map {|url| + @urls ||= Twitter::TwitterText::Extractor.extract_urls(plain_text_without_markdown).map {|url| Addressable::URI.parse(url).normalize.to_s } end From f8c9d2ccd93a936805bf933a09814c5d3f7e5454 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 00:32:19 +0200 Subject: [PATCH 21/55] Bump string-direction --- Gemfile | 2 +- Gemfile.lock | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 6b9d1c0e2..cdadff30f 100644 --- a/Gemfile +++ b/Gemfile @@ -148,7 +148,7 @@ gem "twitter-text", "2.1.0" # RTL support -gem "string-direction", "1.2.0" +gem "string-direction", "1.2.1" # Security Headers diff --git a/Gemfile.lock b/Gemfile.lock index 5ef86d32c..3c221ca6f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -678,8 +678,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) state_machines (0.5.0) - string-direction (1.2.0) - yard (~> 0.8) + string-direction (1.2.1) swd (1.0.1) activesupport (>= 3) attr_required (>= 0.0.5) @@ -895,7 +894,7 @@ DEPENDENCIES spring-commands-cucumber (= 1.0.1) spring-commands-rspec (= 1.0.4) sprockets-rails (= 3.2.1) - string-direction (= 1.2.0) + string-direction (= 1.2.1) timecop (= 0.9.1) turbo_dev_assets (= 0.0.2) twitter (= 6.1.0) From 7854e14e075da7f77ae97bfb8e7f1c4368b0bc65 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 00:47:19 +0200 Subject: [PATCH 22/55] Bump secure_headers --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- config/initializers/secure_headers.rb | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index cdadff30f..ab4793f50 100644 --- a/Gemfile +++ b/Gemfile @@ -152,7 +152,7 @@ gem "string-direction", "1.2.1" # Security Headers -gem "secure_headers", "3.7.1" +gem "secure_headers", "5.0.5" # Services diff --git a/Gemfile.lock b/Gemfile.lock index 3c221ca6f..34a27b2fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -639,8 +639,8 @@ GEM scss_lint (0.54.0) rake (>= 0.9, < 13) sass (~> 3.4.20) - secure_headers (3.7.1) - useragent + secure_headers (5.0.5) + useragent (>= 0.15.0) securecompare (1.0.0) shellany (0.0.1) shoulda-matchers (3.1.2) @@ -730,7 +730,7 @@ GEM get_process_mem (~> 0) unicorn (>= 4, < 6) url_safe_base64 (0.2.2) - useragent (0.16.8) + useragent (0.16.10) uuid (2.3.8) macaddr (~> 1.0) valid (1.2.0) @@ -883,7 +883,7 @@ DEPENDENCIES ruby-oembed (= 0.12.0) rubyzip (= 1.2.1) sass-rails (= 5.0.7) - secure_headers (= 3.7.1) + secure_headers (= 5.0.5) shoulda-matchers (= 3.1.2) sidekiq (= 5.1.3) sidekiq-cron (= 0.6.3) diff --git a/config/initializers/secure_headers.rb b/config/initializers/secure_headers.rb index cf3edbb70..6f4e64318 100644 --- a/config/initializers/secure_headers.rb +++ b/config/initializers/secure_headers.rb @@ -5,13 +5,13 @@ SecureHeaders::Configuration.default do |config| csp = { default_src: %w('none'), - child_src: %w('self' www.youtube.com w.soundcloud.com twitter.com platform.twitter.com syndication.twitter.com - player.vimeo.com www.mixcloud.com www.dailymotion.com media.ccc.de bandcamp.com - www.instagram.com), connect_src: %w('self' embedr.flickr.com geo.query.yahoo.com nominatim.openstreetmap.org api.github.com), font_src: %w('self'), form_action: %w('self' platform.twitter.com syndication.twitter.com), frame_ancestors: %w('self'), + frame_src: %w('self' www.youtube.com w.soundcloud.com twitter.com platform.twitter.com syndication.twitter.com + player.vimeo.com www.mixcloud.com www.dailymotion.com media.ccc.de bandcamp.com + www.instagram.com), img_src: %w('self' data: *), media_src: %w(https:), script_src: %w('self' 'unsafe-eval' platform.twitter.com cdn.syndication.twimg.com widgets.flickr.com From 8b2a4b18c6001a2e93b70ebd9cb7f495ba57d4ea Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 00:55:27 +0200 Subject: [PATCH 23/55] Bump omniauth --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index ab4793f50..8db5bd316 100644 --- a/Gemfile +++ b/Gemfile @@ -156,7 +156,7 @@ gem "secure_headers", "5.0.5" # Services -gem "omniauth", "1.6.1" +gem "omniauth", "1.8.1" gem "omniauth-facebook", "4.0.0" gem "omniauth-tumblr", "1.2" gem "omniauth-twitter", "1.4.0" diff --git a/Gemfile.lock b/Gemfile.lock index 34a27b2fb..141bfc0af 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -291,7 +291,7 @@ GEM sprockets (>= 2.0.0) tilt (>= 1.2) hashdiff (0.3.6) - hashie (3.5.6) + hashie (3.5.7) hitimes (1.2.6) http (2.2.2) addressable (~> 2.3) @@ -406,7 +406,7 @@ GEM rack (>= 1.2, < 3) octokit (4.7.0) sawyer (~> 0.8.0, >= 0.5.3) - omniauth (1.6.1) + omniauth (1.8.1) hashie (>= 3.4.6, < 3.6.0) rack (>= 1.6.2, < 3) omniauth-facebook (4.0.0) @@ -825,7 +825,7 @@ DEPENDENCIES mobile-fu (= 1.4.0) mysql2 (= 0.5.0) nokogiri (= 1.8.2) - omniauth (= 1.6.1) + omniauth (= 1.8.1) omniauth-facebook (= 4.0.0) omniauth-tumblr (= 1.2) omniauth-twitter (= 1.4.0) From 6773a49362cb031a47f6b96ee74119ebcda362f5 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 00:56:36 +0200 Subject: [PATCH 24/55] Bump twitter --- Gemfile | 2 +- Gemfile.lock | 27 ++++++++++++++------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index 8db5bd316..636c7359d 100644 --- a/Gemfile +++ b/Gemfile @@ -160,8 +160,8 @@ gem "omniauth", "1.8.1" gem "omniauth-facebook", "4.0.0" gem "omniauth-tumblr", "1.2" gem "omniauth-twitter", "1.4.0" -gem "twitter", "6.1.0" gem "omniauth-wordpress", "0.2.2" +gem "twitter", "6.2.0" # OpenID Connect gem "openid_connect", "1.1.3" diff --git a/Gemfile.lock b/Gemfile.lock index 141bfc0af..b08742982 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -293,14 +293,14 @@ GEM hashdiff (0.3.6) hashie (3.5.7) hitimes (1.2.6) - http (2.2.2) + http (3.0.0) addressable (~> 2.3) http-cookie (~> 1.0) - http-form_data (~> 1.0.1) + http-form_data (>= 2.0.0.pre.pre2, < 3) http_parser.rb (~> 0.6.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (1.0.3) + http-form_data (2.1.0) http_accept_language (2.1.1) http_parser.rb (0.6.0) httparty (0.15.6) @@ -475,7 +475,7 @@ GEM pry-byebug (3.5.0) byebug (~> 9.1) pry (~> 0.10) - public_suffix (3.0.0) + public_suffix (3.0.2) rack (2.0.4) rack-cors (1.0.2) rack-google-analytics (1.2.0) @@ -700,16 +700,17 @@ GEM hitimes tins (1.15.0) turbo_dev_assets (0.0.2) - twitter (6.1.0) - addressable (~> 2.5) + twitter (6.2.0) + addressable (~> 2.3) buftok (~> 0.2.0) - equalizer (= 0.0.11) - faraday (~> 0.11.0) - http (~> 2.1) + equalizer (~> 0.0.11) + http (~> 3.0) + http-form_data (~> 2.0) http_parser.rb (~> 0.6.0) - memoizable (~> 0.4.2) - naught (~> 1.1) - simple_oauth (~> 0.3.1) + memoizable (~> 0.4.0) + multipart-post (~> 2.0) + naught (~> 1.0) + simple_oauth (~> 0.3.0) twitter-text (2.1.0) idn-ruby unf (~> 0.1.0) @@ -897,7 +898,7 @@ DEPENDENCIES string-direction (= 1.2.1) timecop (= 0.9.1) turbo_dev_assets (= 0.0.2) - twitter (= 6.1.0) + twitter (= 6.2.0) twitter-text (= 2.1.0) typhoeus (= 1.3.0) uglifier (= 4.1.8) From 9c054e03d8012cf68c31ce39d9ac99a6aabdee6d Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 00:58:25 +0200 Subject: [PATCH 25/55] Bump openid_connect --- Gemfile | 2 +- Gemfile.lock | 31 ++++++++++++++----------------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/Gemfile b/Gemfile index 636c7359d..6229e7e80 100644 --- a/Gemfile +++ b/Gemfile @@ -164,7 +164,7 @@ gem "omniauth-wordpress", "0.2.2" gem "twitter", "6.2.0" # OpenID Connect -gem "openid_connect", "1.1.3" +gem "openid_connect", "1.1.5" # Serializers diff --git a/Gemfile.lock b/Gemfile.lock index b08742982..b45a7c320 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -52,6 +52,7 @@ GEM rack (>= 1.1.0) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) + aes_key_wrap (1.0.1) arel (8.0.0) asset_sync (2.2.0) activemodel (>= 4.1.0) @@ -63,7 +64,7 @@ GEM autoprefixer-rails (8.2.0) execjs bcrypt (3.1.11) - bindata (2.4.1) + bindata (2.4.3) bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) @@ -334,10 +335,10 @@ GEM rails (>= 4.0, < 6.0) sprockets (>= 3.0.0) json (2.1.0) - json-jwt (1.7.2) + json-jwt (1.9.2) activesupport + aes_key_wrap bindata - multi_json (>= 1.3) securecompare url_safe_base64 json-schema (2.8.0) @@ -428,10 +429,9 @@ GEM open_graph_reader (0.6.2) faraday (>= 0.9.0) nokogiri (~> 1.6) - openid_connect (1.1.3) + openid_connect (1.1.5) activemodel attr_required (>= 1.0.0) - json (>= 1.4.3) json-jwt (>= 1.5.0) rack-oauth2 (>= 1.6.1) swd (>= 1.0.0) @@ -483,12 +483,12 @@ GEM activesupport rack-mobile-detect (0.4.0) rack - rack-oauth2 (1.6.2) - activesupport (>= 2.3) - attr_required (>= 0.0.5) - httpclient (>= 2.4) - multi_json (>= 1.3.6) - rack (>= 1.1) + rack-oauth2 (1.9.1) + activesupport + attr_required + httpclient + json-jwt (>= 1.9.0) + rack rack-piwik (0.3.0) rack-protection (2.0.1) rack @@ -679,12 +679,10 @@ GEM sprockets (>= 3.0.0) state_machines (0.5.0) string-direction (1.2.1) - swd (1.0.1) + swd (1.1.2) activesupport (>= 3) attr_required (>= 0.0.5) httpclient (>= 2.4) - i18n - json (>= 1.4.3) sysexits (1.2.0) systemu (2.6.5) temple (0.8.0) @@ -747,10 +745,9 @@ GEM yard (~> 0.7) warden (1.2.7) rack (>= 1.0) - webfinger (1.0.2) + webfinger (1.1.0) activesupport httpclient (>= 2.4) - multi_json webmock (3.0.1) addressable (>= 2.3.6) crack (>= 0.3.2) @@ -832,7 +829,7 @@ DEPENDENCIES omniauth-twitter (= 1.4.0) omniauth-wordpress (= 0.2.2) open_graph_reader (= 0.6.2) - openid_connect (= 1.1.3) + openid_connect (= 1.1.5) pg (= 1.0.0) poltergeist (= 1.16.0) pronto (= 0.9.5) From b8094544a00f3aa5aff32e4ae3ff4c157c71c8bb Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 01:08:56 +0200 Subject: [PATCH 26/55] Bump faraday --- Gemfile | 2 +- Gemfile.lock | 4 ++-- .../api/openid_connect/clients_controller_spec.rb | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 6229e7e80..123e13e66 100644 --- a/Gemfile +++ b/Gemfile @@ -181,7 +181,7 @@ gem "acts-as-taggable-on", "5.0.0" # URIs and HTTP gem "addressable", "2.5.2", require: "addressable/uri" -gem "faraday", "0.11.0" # also update User-Agent in OpenID specs +gem "faraday", "0.12.2" # also update User-Agent in OpenID specs 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 b45a7c320..ad4af429e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -211,7 +211,7 @@ GEM factory_girl_rails (4.8.0) factory_girl (~> 4.8.0) railties (>= 3.0.0) - faraday (0.11.0) + faraday (0.12.2) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) @@ -790,7 +790,7 @@ DEPENDENCIES entypo-rails (= 3.0.0) eye (= 0.9.2) factory_girl_rails (= 4.8.0) - faraday (= 0.11.0) + faraday (= 0.12.2) faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.12.2) fixture_builder (= 0.5.0) diff --git a/spec/controllers/api/openid_connect/clients_controller_spec.rb b/spec/controllers/api/openid_connect/clients_controller_spec.rb index 1a2c0eb4d..b1f59640d 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.11.0" + "User-Agent" => "Faraday v0.12.2" }) .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.11.0" + "User-Agent" => "Faraday v0.12.2" }) .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.11.0" + "User-Agent" => "Faraday v0.12.2" }) .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.11.0" + "User-Agent" => "Faraday v0.12.2" }) .to_return(status: 200, body: "{\"keys\":[{\"kty\":\"RSA\",\"e\":\"AQAB\",\"n\":\"qpW\",\"use\":\"sig\"}]}", headers: {}) From 7ea9a4d7aefaf8ec3befb2ce801d9527105b52c0 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 01:10:29 +0200 Subject: [PATCH 27/55] Bump gon --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 123e13e66..7dbf321ee 100644 --- a/Gemfile +++ b/Gemfile @@ -188,7 +188,7 @@ gem "typhoeus", "1.3.0" # Views -gem "gon", "6.1.0" +gem "gon", "6.2.0" gem "hamlit", "2.8.6" gem "mobile-fu", "1.4.0" gem "rails-timeago", "2.16.0" diff --git a/Gemfile.lock b/Gemfile.lock index ad4af429e..655ea5a60 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -248,9 +248,8 @@ GEM terminal-table globalid (0.4.1) activesupport (>= 4.2.0) - gon (6.1.0) + gon (6.2.0) actionpack (>= 3.0) - json multi_json request_store (>= 1.0) guard (2.14.1) @@ -585,7 +584,8 @@ GEM ffi (>= 0.5.0, < 2) redcarpet (3.4.0) redis (3.3.5) - request_store (1.3.2) + request_store (1.4.1) + rack (>= 1.4) responders (2.4.0) actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) @@ -796,7 +796,7 @@ DEPENDENCIES fixture_builder (= 0.5.0) fog-aws (= 2.0.1) fuubar (= 2.2.0) - gon (= 6.1.0) + gon (= 6.2.0) guard (= 2.14.1) guard-cucumber (= 2.1.2) guard-rspec (= 4.7.3) From 9240a616628f44a31a5806fe939be9014cec0e8d Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 01:12:11 +0200 Subject: [PATCH 28/55] Bump hamlit --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 7dbf321ee..eda4d7840 100644 --- a/Gemfile +++ b/Gemfile @@ -189,7 +189,7 @@ gem "typhoeus", "1.3.0" # Views gem "gon", "6.2.0" -gem "hamlit", "2.8.6" +gem "hamlit", "2.8.8" 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 655ea5a60..f1e51d1a4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -282,7 +282,7 @@ GEM rake (>= 10, < 13) rubocop (>= 0.49.0) sysexits (~> 1.1) - hamlit (2.8.6) + hamlit (2.8.8) temple (>= 0.8.0) thor tilt @@ -802,7 +802,7 @@ DEPENDENCIES guard-rspec (= 4.7.3) guard-rubocop (= 1.3.0) haml_lint (= 0.26.0) - hamlit (= 2.8.6) + hamlit (= 2.8.8) handlebars_assets (= 0.23.2) http_accept_language (= 2.1.1) i18n-inflector-rails (= 1.0.7) From 0602e7fa9493d78dd14c5c5b0b26f74370d08701 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 01:19:17 +0200 Subject: [PATCH 29/55] Bump versionist --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index eda4d7840..6c464623b 100644 --- a/Gemfile +++ b/Gemfile @@ -209,7 +209,7 @@ gem "rubyzip", "1.2.1", require: "zip" # https://github.com/discourse/discourse/pull/238 gem "minitest" -gem "versionist", "1.6.0" +gem "versionist", "1.7.0" # Windows and OSX have an execjs compatible runtime built-in, Linux users should # install Node.js or use "therubyracer". diff --git a/Gemfile.lock b/Gemfile.lock index f1e51d1a4..c4f45b170 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -739,10 +739,10 @@ GEM validate_url (1.0.2) activemodel (>= 3.0.0) addressable - versionist (1.6.0) + versionist (1.7.0) activesupport (>= 3) railties (>= 3) - yard (~> 0.7) + yard (~> 0.9.11) warden (1.2.7) rack (>= 1.0) webfinger (1.1.0) @@ -902,7 +902,7 @@ DEPENDENCIES unicorn (= 5.4.0) unicorn-worker-killer (= 0.4.4) uuid (= 2.3.8) - versionist (= 1.6.0) + versionist (= 1.7.0) webmock (= 3.0.1) will_paginate (= 3.1.6) From 9e20215a249336306d03b5fefccdce2e21ccf69c Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 01:22:49 +0200 Subject: [PATCH 30/55] Bump eye --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- script/configure_bundler | 4 ---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 6c464623b..c02c7013d 100644 --- a/Gemfile +++ b/Gemfile @@ -226,7 +226,7 @@ group :production do # we don"t install these on travis to speed up test runs # Process management - gem "eye", "0.9.2" + gem "eye", "0.10.0" # Redirects diff --git a/Gemfile.lock b/Gemfile.lock index c4f45b170..5cce823f3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -199,10 +199,10 @@ GEM ffi (>= 1.3.0) excon (0.62.0) execjs (2.7.0) - eye (0.9.2) + eye (0.10.0) celluloid (~> 0.17.3) celluloid-io (~> 0.17.0) - sigar (~> 0.7.3) + kostya-sigar (~> 2.0.0) state_machines thor fabrication (2.20.1) @@ -349,6 +349,7 @@ GEM multi_json jwt (1.5.6) kgio (2.11.2) + kostya-sigar (2.0.0) leaflet-rails (1.3.1) rails (>= 4.2.0) listen (3.1.5) @@ -653,7 +654,6 @@ GEM sidekiq-cron (0.6.3) rufus-scheduler (>= 3.3.0) sidekiq (>= 4.2.1) - sigar (0.7.3) simple_captcha2 (0.4.3) rails (>= 4.1) simple_oauth (0.3.1) @@ -788,7 +788,7 @@ DEPENDENCIES diaspora_federation-rails (= 0.2.4) diaspora_federation-test (= 0.2.4) entypo-rails (= 3.0.0) - eye (= 0.9.2) + eye (= 0.10.0) factory_girl_rails (= 4.8.0) faraday (= 0.12.2) faraday-cookie_jar (= 0.0.6) diff --git a/script/configure_bundler b/script/configure_bundler index 1f30cca70..67e6aa055 100755 --- a/script/configure_bundler +++ b/script/configure_bundler @@ -28,8 +28,4 @@ if rails_env != "development" config("disable_shared_gems true") end -if `gcc -dumpversion`.split(".").first.to_i >= 5 - config("build.sigar \"--with-cppflags='-fgnu89-inline'\"") -end - puts "Bundler configured! Please run 'bin/bundle install' now." From c98b766d03172fa51cf8b11d4e6058f9d1b01442 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 01:25:35 +0200 Subject: [PATCH 31/55] Bump asset_sync --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index c02c7013d..e7dec58d7 100644 --- a/Gemfile +++ b/Gemfile @@ -235,7 +235,7 @@ group :production do # we don"t install these on travis to speed up test runs # Third party asset hosting - gem "asset_sync", "2.2.0", require: false + gem "asset_sync", "2.4.0", require: false end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 5cce823f3..bd54a1238 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.2.0) + asset_sync (2.4.0) activemodel (>= 4.1.0) fog-core mime-types (>= 2.99) @@ -769,7 +769,7 @@ DEPENDENCIES acts-as-taggable-on (= 5.0.0) acts_as_api (= 1.0.1) addressable (= 2.5.2) - asset_sync (= 2.2.0) + asset_sync (= 2.4.0) autoprefixer-rails (= 8.2.0) bootstrap-sass (= 3.3.7) bootstrap-switch-rails (= 3.3.3) From 39f0c58c4e8b8e786f3155eec918406106e14006 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 01:29:15 +0200 Subject: [PATCH 32/55] Bump guard --- Gemfile | 2 +- Gemfile.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index e7dec58d7..546fe2df3 100644 --- a/Gemfile +++ b/Gemfile @@ -240,7 +240,7 @@ end group :development do # Automatic test runs - gem "guard", "2.14.1", require: false + gem "guard", "2.14.2", 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 bd54a1238..f9600b4f7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -252,10 +252,10 @@ GEM actionpack (>= 3.0) multi_json request_store (>= 1.0) - guard (2.14.1) + guard (2.14.2) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) - lumberjack (~> 1.0) + lumberjack (>= 1.0.12, < 2.0) nenv (~> 0.1) notiffany (~> 0.0) pry (>= 0.9.12) @@ -365,7 +365,7 @@ GEM loofah (2.2.2) crass (~> 1.0.2) nokogiri (>= 1.5.9) - lumberjack (1.0.12) + lumberjack (1.0.13) macaddr (1.7.1) systemu (~> 2.6.2) mail (2.7.0) @@ -374,7 +374,7 @@ GEM markerb (1.1.0) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) - method_source (0.8.2) + method_source (0.9.0) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) @@ -469,9 +469,9 @@ GEM pronto-scss (0.9.1) pronto (~> 0.9.0) scss_lint (~> 0.43, >= 0.43.0) - pry (0.11.0) + pry (0.11.3) coderay (~> 1.1.0) - method_source (~> 0.8.1) + method_source (~> 0.9.0) pry-byebug (3.5.0) byebug (~> 9.1) pry (~> 0.10) @@ -797,7 +797,7 @@ DEPENDENCIES fog-aws (= 2.0.1) fuubar (= 2.2.0) gon (= 6.2.0) - guard (= 2.14.1) + guard (= 2.14.2) guard-cucumber (= 2.1.2) guard-rspec (= 4.7.3) guard-rubocop (= 1.3.0) From 36c55e2d2eb796e98320889dee86b2001b1f8f41 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 01:30:47 +0200 Subject: [PATCH 33/55] Bump rb-fsevent --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 546fe2df3..1f93d1d41 100644 --- a/Gemfile +++ b/Gemfile @@ -244,7 +244,7 @@ group :development do gem "guard-cucumber", "2.1.2", require: false gem "guard-rspec", "4.7.3", require: false gem "guard-rubocop", "1.3.0", require: false - gem "rb-fsevent", "0.10.2", require: false + gem "rb-fsevent", "0.10.3", require: false gem "rb-inotify", "0.9.10", require: false # Linters diff --git a/Gemfile.lock b/Gemfile.lock index f9600b4f7..d2fa8c4d2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -580,7 +580,7 @@ GEM rake raindrops (0.19.0) rake (12.3.1) - rb-fsevent (0.10.2) + rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) redcarpet (3.4.0) @@ -870,7 +870,7 @@ DEPENDENCIES rails-controller-testing (= 1.0.2) rails-i18n (= 5.1.1) rails-timeago (= 2.16.0) - rb-fsevent (= 0.10.2) + rb-fsevent (= 0.10.3) rb-inotify (= 0.9.10) redcarpet (= 3.4.0) redis (= 3.3.5) From 6d0cee30475577866648373570e30134103ad301 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 01:32:06 +0200 Subject: [PATCH 34/55] Bump haml_lint --- Gemfile | 2 +- Gemfile.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 1f93d1d41..707cba77f 100644 --- a/Gemfile +++ b/Gemfile @@ -248,7 +248,7 @@ group :development do gem "rb-inotify", "0.9.10", require: false # Linters - gem "haml_lint", "0.26.0", require: false + gem "haml_lint", "0.27.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 d2fa8c4d2..acc5d596a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -59,7 +59,7 @@ GEM fog-core mime-types (>= 2.99) unf - ast (2.3.0) + ast (2.4.0) attr_required (1.0.1) autoprefixer-rails (8.2.0) execjs @@ -276,11 +276,11 @@ GEM haml (5.0.4) temple (>= 0.8.0) tilt - haml_lint (0.26.0) + haml_lint (0.27.0) haml (>= 4.0, < 5.1) rainbow rake (>= 10, < 13) - rubocop (>= 0.49.0) + rubocop (>= 0.50.0) sysexits (~> 1.1) hamlit (2.8.8) temple (>= 0.8.0) @@ -440,9 +440,9 @@ GEM validate_url webfinger (>= 1.0.1) orm_adapter (0.5.0) - parallel (1.12.0) - parser (2.4.0.0) - ast (~> 2.2) + parallel (1.12.1) + parser (2.5.0.5) + ast (~> 2.4.0) pg (1.0.0) phantomjs (2.1.1.0) poltergeist (1.16.0) @@ -620,7 +620,7 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-oembed (0.12.0) - ruby-progressbar (1.8.3) + ruby-progressbar (1.9.0) ruby_dep (1.5.0) rubyzip (1.2.1) rufus-scheduler (3.4.2) @@ -801,7 +801,7 @@ DEPENDENCIES guard-cucumber (= 2.1.2) guard-rspec (= 4.7.3) guard-rubocop (= 1.3.0) - haml_lint (= 0.26.0) + haml_lint (= 0.27.0) hamlit (= 2.8.8) handlebars_assets (= 0.23.2) http_accept_language (= 2.1.1) From 64f330d66b1823f5f7988fc6893b38bb92971565 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 01:39:58 +0200 Subject: [PATCH 35/55] Bump rubocop --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 707cba77f..71c033850 100644 --- a/Gemfile +++ b/Gemfile @@ -254,7 +254,7 @@ group :development do gem "pronto-haml", "0.9.0", require: false gem "pronto-rubocop", "0.9.0", require: false gem "pronto-scss", "0.9.1", require: false - gem "rubocop", "0.50.0", require: false + gem "rubocop", "0.54.0", require: false # Preloading environment diff --git a/Gemfile.lock b/Gemfile.lock index acc5d596a..d275424ec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -612,11 +612,11 @@ GEM rspec-mocks (~> 3.6.0) rspec-support (~> 3.6.0) rspec-support (3.6.0) - rubocop (0.50.0) + rubocop (0.54.0) parallel (~> 1.10) - parser (>= 2.3.3.1, < 3.0) + parser (>= 2.5) powerpack (~> 0.1) - rainbow (>= 2.2.2, < 3.0) + rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-oembed (0.12.0) @@ -877,7 +877,7 @@ DEPENDENCIES responders (= 2.4.0) rspec-json_expectations (~> 2.1) rspec-rails (= 3.6.1) - rubocop (= 0.50.0) + rubocop (= 0.54.0) ruby-oembed (= 0.12.0) rubyzip (= 1.2.1) sass-rails (= 5.0.7) From cba90cebe87bfd0e443bcc05801eee41f75e686b Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 01:45:50 +0200 Subject: [PATCH 36/55] Bump pry-byebug --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d275424ec..4468e69c4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -71,7 +71,7 @@ GEM bootstrap-switch-rails (3.3.3) buftok (0.2.0) builder (3.2.3) - byebug (9.1.0) + byebug (10.0.2) capybara (2.15.1) addressable mini_mime (>= 0.1.3) @@ -472,8 +472,8 @@ GEM pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) - pry-byebug (3.5.0) - byebug (~> 9.1) + pry-byebug (3.6.0) + byebug (~> 10.0) pry (~> 0.10) public_suffix (3.0.2) rack (2.0.4) From e0b4bff6a69223f67500be42059cc847b05f389d Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 01:50:37 +0200 Subject: [PATCH 37/55] Bump fixture_builder --- Gemfile | 2 +- Gemfile.lock | 4 ++-- config/environments/test.rb | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 71c033850..53c428db8 100644 --- a/Gemfile +++ b/Gemfile @@ -275,7 +275,7 @@ end group :test do # RSpec (unit tests, some integration tests) - gem "fixture_builder", "0.5.0" + gem "fixture_builder", "0.5.1" gem "fuubar", "2.2.0" gem "json-schema-rspec", "0.0.4" gem "rspec-json_expectations", "~> 2.1" diff --git a/Gemfile.lock b/Gemfile.lock index 4468e69c4..d32f58e18 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -219,7 +219,7 @@ GEM faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) ffi (1.9.23) - fixture_builder (0.5.0) + fixture_builder (0.5.1) activerecord (>= 2) activesupport (>= 2) fog-aws (2.0.1) @@ -793,7 +793,7 @@ DEPENDENCIES faraday (= 0.12.2) faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.12.2) - fixture_builder (= 0.5.0) + fixture_builder (= 0.5.1) fog-aws (= 2.0.1) fuubar (= 2.2.0) gon (= 6.2.0) diff --git a/config/environments/test.rb b/config/environments/test.rb index 988cf7044..8ba013117 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -58,4 +58,7 @@ Rails.application.configure do # Raises error for missing translations # config.action_view.raise_on_missing_translations = true + + # for fixture_builder + ENV["FIXTURES_PATH"] = "spec/fixtures" end From 1a6afa54e828fbb804af0620684d3236fce86983 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 01:55:44 +0200 Subject: [PATCH 38/55] Bump fuubar --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 53c428db8..994b12da7 100644 --- a/Gemfile +++ b/Gemfile @@ -276,7 +276,7 @@ group :test do # RSpec (unit tests, some integration tests) gem "fixture_builder", "0.5.1" - gem "fuubar", "2.2.0" + gem "fuubar", "2.3.1" gem "json-schema-rspec", "0.0.4" gem "rspec-json_expectations", "~> 2.1" diff --git a/Gemfile.lock b/Gemfile.lock index d32f58e18..5de267339 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.2.0) + fuubar (2.3.1) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) get_process_mem (0.2.1) @@ -795,7 +795,7 @@ DEPENDENCIES faraday_middleware (= 0.12.2) fixture_builder (= 0.5.1) fog-aws (= 2.0.1) - fuubar (= 2.2.0) + fuubar (= 2.3.1) gon (= 6.2.0) guard (= 2.14.2) guard-cucumber (= 2.1.2) From 5432a9183944dee51194783c8acd2c3bff0fa664 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 02:01:25 +0200 Subject: [PATCH 39/55] Bump capybara --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 994b12da7..2f4925ef1 100644 --- a/Gemfile +++ b/Gemfile @@ -282,7 +282,7 @@ group :test do # Cucumber (integration tests) - gem "capybara", "2.15.1" + gem "capybara", "2.18.0" gem "database_cleaner", "1.6.1" gem "poltergeist", "1.16.0" diff --git a/Gemfile.lock b/Gemfile.lock index 5de267339..fb83b834d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,13 +72,13 @@ GEM buftok (0.2.0) builder (3.2.3) byebug (10.0.2) - capybara (2.15.1) + capybara (2.18.0) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - xpath (~> 2.0) + xpath (>= 2.0, < 4.0) carrierwave (1.2.2) activemodel (>= 4.0.0) activesupport (>= 4.0.0) @@ -756,8 +756,8 @@ GEM websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) will_paginate (3.1.6) - xpath (2.1.0) - nokogiri (~> 1.3) + xpath (3.0.0) + nokogiri (~> 1.8) yard (0.9.12) PLATFORMS @@ -773,7 +773,7 @@ DEPENDENCIES autoprefixer-rails (= 8.2.0) bootstrap-sass (= 3.3.7) bootstrap-switch-rails (= 3.3.3) - capybara (= 2.15.1) + capybara (= 2.18.0) carrierwave (= 1.2.2) compass-rails (= 3.0.2) configurate (= 0.3.1) From e0a8a5e34c74981c173ed572866f3373a2ebbc70 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 02:06:33 +0200 Subject: [PATCH 40/55] Bump database_cleaner --- Gemfile | 2 +- Gemfile.lock | 4 ++-- features/support/env.rb | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 2f4925ef1..275a7a474 100644 --- a/Gemfile +++ b/Gemfile @@ -283,7 +283,7 @@ group :test do # Cucumber (integration tests) gem "capybara", "2.18.0" - gem "database_cleaner", "1.6.1" + gem "database_cleaner", "1.6.2" gem "poltergeist", "1.16.0" gem "cucumber-api-steps", "0.13", require: false diff --git a/Gemfile.lock b/Gemfile.lock index fb83b834d..9b88921e8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -156,7 +156,7 @@ GEM nokogiri (~> 1.5) railties (>= 4, < 5.2) cucumber-wire (0.0.1) - database_cleaner (1.6.1) + database_cleaner (1.6.2) devise (4.4.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -780,7 +780,7 @@ DEPENDENCIES coveralls (= 0.8.21) cucumber-api-steps (= 0.13) cucumber-rails (= 1.5.0) - database_cleaner (= 1.6.1) + database_cleaner (= 1.6.2) devise (= 4.4.3) devise_lastseenable (= 0.0.6) diaspora-prosody-config (= 0.0.7) diff --git a/features/support/env.rb b/features/support/env.rb index 7ee2f0e9d..631a207ac 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -53,9 +53,6 @@ Capybara.default_max_wait_time = 30 # of your scenarios, as this makes it hard to discover errors in your application. ActionController::Base.allow_rescue = false -# TODO: Temporary fix for rails 5, remove the next line after a new version of database_cleaner is released. -# See https://github.com/DatabaseCleaner/database_cleaner/issues/445 -Cucumber::Rails::Database.javascript_strategy = :truncation, {except: %w[ar_internal_metadata]} Cucumber::Rails::Database.autorun_database_cleaner = true Cucumber::Rails::World.use_transactional_tests = false From 2b4fed8339ffa9b57ad663f496ffadfa750d255f Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 02:07:44 +0200 Subject: [PATCH 41/55] Bump poltergeist --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 275a7a474..ce2feae5c 100644 --- a/Gemfile +++ b/Gemfile @@ -284,7 +284,7 @@ group :test do gem "capybara", "2.18.0" gem "database_cleaner", "1.6.2" - gem "poltergeist", "1.16.0" + gem "poltergeist", "1.17.0" gem "cucumber-api-steps", "0.13", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 9b88921e8..b7cdfde9c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -445,7 +445,7 @@ GEM ast (~> 2.4.0) pg (1.0.0) phantomjs (2.1.1.0) - poltergeist (1.16.0) + poltergeist (1.17.0) capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) @@ -831,7 +831,7 @@ DEPENDENCIES open_graph_reader (= 0.6.2) openid_connect (= 1.1.5) pg (= 1.0.0) - poltergeist (= 1.16.0) + poltergeist (= 1.17.0) pronto (= 0.9.5) pronto-eslint (= 0.9.1) pronto-haml (= 0.9.0) From 42c93fd4cbecd03e6562aebb207eb541d27a9d82 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 02:10:24 +0200 Subject: [PATCH 42/55] Bump cucumber-api-steps --- Gemfile | 2 +- Gemfile.lock | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index ce2feae5c..099d95644 100644 --- a/Gemfile +++ b/Gemfile @@ -286,7 +286,7 @@ group :test do gem "database_cleaner", "1.6.2" gem "poltergeist", "1.17.0" - gem "cucumber-api-steps", "0.13", require: false + gem "cucumber-api-steps", "0.14", require: false # General helpers diff --git a/Gemfile.lock b/Gemfile.lock index b7cdfde9c..a11df047f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -135,7 +135,7 @@ GEM crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.3) - cucumber (2.4.0) + cucumber (2.99.0) builder (>= 2.1.2) cucumber-core (~> 1.5.0) cucumber-wire (~> 0.0.1) @@ -143,10 +143,9 @@ GEM gherkin (~> 4.0) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.1.2) - cucumber-api-steps (0.13) - cucumber (>= 1.2.1) + cucumber-api-steps (0.14.0) + cucumber (>= 2.0.2) jsonpath (>= 0.1.2) - rspec (>= 2.12.0) cucumber-core (1.5.0) gherkin (~> 4.0) cucumber-rails (1.5.0) @@ -345,8 +344,9 @@ GEM json-schema-rspec (0.0.4) json-schema (~> 2.5) rspec - jsonpath (0.8.7) + jsonpath (0.8.11) multi_json + to_regexp (~> 0.2.1) jwt (1.5.6) kgio (2.11.2) kostya-sigar (2.0.0) @@ -697,6 +697,7 @@ GEM timers (4.1.2) hitimes tins (1.15.0) + to_regexp (0.2.1) turbo_dev_assets (0.0.2) twitter (6.2.0) addressable (~> 2.3) @@ -778,7 +779,7 @@ DEPENDENCIES compass-rails (= 3.0.2) configurate (= 0.3.1) coveralls (= 0.8.21) - cucumber-api-steps (= 0.13) + cucumber-api-steps (= 0.14) cucumber-rails (= 1.5.0) database_cleaner (= 1.6.2) devise (= 4.4.3) From fc2834e7c1b2a93c28ded096643af1832b4f3d2c Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 02:16:28 +0200 Subject: [PATCH 43/55] Bump webmock --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 099d95644..678c2def6 100644 --- a/Gemfile +++ b/Gemfile @@ -293,7 +293,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.0.1", require: false + gem "webmock", "3.3.0", require: false gem "diaspora_federation-test", "0.2.4" diff --git a/Gemfile.lock b/Gemfile.lock index a11df047f..be7d9245a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -289,7 +289,7 @@ GEM execjs (~> 2.0) sprockets (>= 2.0.0) tilt (>= 1.2) - hashdiff (0.3.6) + hashdiff (0.3.7) hashie (3.5.7) hitimes (1.2.6) http (3.0.0) @@ -749,7 +749,7 @@ GEM webfinger (1.1.0) activesupport httpclient (>= 2.4) - webmock (3.0.1) + webmock (3.3.0) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -904,7 +904,7 @@ DEPENDENCIES unicorn-worker-killer (= 0.4.4) uuid (= 2.3.8) versionist (= 1.7.0) - webmock (= 3.0.1) + webmock (= 3.3.0) will_paginate (= 3.1.6) BUNDLED WITH From eb68343ae1e0ee4a8e14468e8417bbfb184d9bc1 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 02:20:11 +0200 Subject: [PATCH 44/55] Bump rspec and rspec-rails --- Gemfile | 2 +- Gemfile.lock | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Gemfile b/Gemfile index 678c2def6..757f2887a 100644 --- a/Gemfile +++ b/Gemfile @@ -303,7 +303,7 @@ end group :development, :test do # RSpec (unit tests, some integration tests) - gem "rspec-rails", "3.6.1" + gem "rspec-rails", "3.7.2" # Cucumber (integration tests) gem "cucumber-rails", "1.5.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index be7d9245a..c88df37c5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -590,28 +590,28 @@ GEM responders (2.4.0) actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) - rspec (3.6.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-core (3.6.0) - rspec-support (~> 3.6.0) - rspec-expectations (3.6.0) + 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) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) + rspec-support (~> 3.7.0) rspec-json_expectations (2.1.0) - rspec-mocks (3.6.0) + rspec-mocks (3.7.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-rails (3.6.1) + rspec-support (~> 3.7.0) + rspec-rails (3.7.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-support (~> 3.6.0) - rspec-support (3.6.0) + 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) rubocop (0.54.0) parallel (~> 1.10) parser (>= 2.5) @@ -877,7 +877,7 @@ DEPENDENCIES redis (= 3.3.5) responders (= 2.4.0) rspec-json_expectations (~> 2.1) - rspec-rails (= 3.6.1) + rspec-rails (= 3.7.2) rubocop (= 0.54.0) ruby-oembed (= 0.12.0) rubyzip (= 1.2.1) From 0e526f92215d50b4958e4a5ad4343708c4bb1002 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 02:52:49 +0200 Subject: [PATCH 45/55] Bump jasmine Disable random tests for now, many tests fail when this is true (which is now default) --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- config/environments/test.rb | 2 ++ spec/javascripts/support/jasmine.yml | 3 +++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 757f2887a..82291f0bc 100644 --- a/Gemfile +++ b/Gemfile @@ -309,7 +309,7 @@ group :development, :test do gem "cucumber-rails", "1.5.0", require: false # Jasmine (client side application tests (JS)) - gem "jasmine", "2.8.0" + gem "jasmine", "3.1.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 c88df37c5..6a4819be0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -315,12 +315,12 @@ GEM railties (>= 3.0.0) idn-ruby (0.1.0) ipaddress (0.8.3) - jasmine (2.8.0) - jasmine-core (>= 2.8.0, < 3.0.0) + jasmine (3.1.0) + jasmine-core (= 3.1.0) phantomjs rack (>= 1.2.1) rake - jasmine-core (2.8.0) + jasmine-core (3.1.0) jasmine-jquery-rails (2.0.3) jquery-rails (4.3.1) rails-dom-testing (>= 1, < 3) @@ -530,7 +530,7 @@ 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.8.0) + rails-assets-jasmine (2.99.2) rails-assets-jasmine-ajax (3.3.1) rails-assets-jasmine (~> 2) rails-assets-jquery (3.2.1) @@ -807,7 +807,7 @@ DEPENDENCIES handlebars_assets (= 0.23.2) http_accept_language (= 2.1.1) i18n-inflector-rails (= 1.0.7) - jasmine (= 2.8.0) + jasmine (= 3.1.0) jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.3.1) js-routes (= 1.4.3) diff --git a/config/environments/test.rb b/config/environments/test.rb index 8ba013117..26db9c226 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -32,6 +32,8 @@ Rails.application.configure do color_themes/original/desktop.css color_themes/dark_green/desktop.css color_themes/original/mobile.css + jasmine-load-all.js + jasmine-jquery.js ] # Show full error reports and disable caching. diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml index cec433307..cac5e7fcb 100644 --- a/spec/javascripts/support/jasmine.yml +++ b/spec/javascripts/support/jasmine.yml @@ -80,3 +80,6 @@ spec_dir: spec/javascripts rack_options: Host: '0.0.0.0' + +# TODO: refactor tests, they shouldn't fail when they are run in a random order! +random: false From ed8c03860aab115d253a7086cdec323eeca649aa Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 03:46:55 +0200 Subject: [PATCH 46/55] Bump chunky_png --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6a4819be0..360492e31 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -104,7 +104,7 @@ GEM timers (>= 4.1.1) celluloid-supervision (0.20.6) timers (>= 4.1.1) - chunky_png (1.3.8) + chunky_png (1.3.10) cliver (0.3.2) coderay (1.1.2) compass (1.0.3) From 129efe66eb4778ee304e09e81024e39effbee1b7 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 03:48:46 +0200 Subject: [PATCH 47/55] Bump et-orbi --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 360492e31..b5e238408 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -192,7 +192,7 @@ GEM execjs multi_json (>= 1.3) rake - et-orbi (1.0.5) + et-orbi (1.1.0) tzinfo ethon (0.11.0) ffi (>= 1.3.0) From 6165a6664cff475f2ed3e95d87a8035f71d5d28e Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 03:49:46 +0200 Subject: [PATCH 48/55] Bump gitlab --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b5e238408..f221e66cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -242,7 +242,7 @@ GEM ruby-progressbar (~> 1.4) get_process_mem (0.2.1) gherkin (4.1.3) - gitlab (4.2.0) + gitlab (4.3.0) httparty terminal-table globalid (0.4.1) @@ -302,7 +302,7 @@ GEM http-form_data (2.1.0) http_accept_language (2.1.1) http_parser.rb (0.6.0) - httparty (0.15.6) + httparty (0.16.2) multi_xml (>= 0.5.2) httpclient (2.8.3) i18n (1.0.0) From 309d6d704946527994f7b37be4830db828350160 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 03:51:47 +0200 Subject: [PATCH 49/55] Bump oauth --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f221e66cd..8392e9ebf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -398,7 +398,7 @@ GEM notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) - oauth (0.5.3) + oauth (0.5.4) oauth2 (1.4.0) faraday (>= 0.8, < 0.13) jwt (~> 1.0) From e6c3d0c8f710c15e2e983c0f64900986bde3e6dc Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 03:55:20 +0200 Subject: [PATCH 50/55] Bump octokit --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8392e9ebf..77d5cabeb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -405,7 +405,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - octokit (4.7.0) + octokit (4.8.0) sawyer (~> 0.8.0, >= 0.5.3) omniauth (1.8.1) hashie (>= 3.4.6, < 3.6.0) From 7e3e0058b680917081957c3aa364638da0dc4f2c Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 03:56:19 +0200 Subject: [PATCH 51/55] Bump omniauth-oauth2 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 77d5cabeb..ed64be285 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -415,8 +415,8 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.4.0) - oauth2 (~> 1.0) + omniauth-oauth2 (1.5.0) + oauth2 (~> 1.1) omniauth (~> 1.2) omniauth-tumblr (1.2) multi_json From 6767465843a5b239ecd4be5f80c59f92dfb83684 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 03:59:08 +0200 Subject: [PATCH 52/55] Bump rugged --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ed64be285..12a0c7dd9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -625,7 +625,7 @@ GEM rubyzip (1.2.1) rufus-scheduler (3.4.2) et-orbi (~> 1.0) - rugged (0.26.0) + rugged (0.27.0) safe_yaml (1.0.4) sass (3.4.25) sass-rails (5.0.7) From 417ec29ad0f326f6cf5e779fe4195183e1371da4 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 04:00:06 +0200 Subject: [PATCH 53/55] Bump scss_lint --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 12a0c7dd9..1787e781e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -637,7 +637,7 @@ GEM sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) - scss_lint (0.54.0) + scss_lint (0.55.0) rake (>= 0.9, < 13) sass (~> 3.4.20) secure_headers (5.0.5) From 9fb63c8bd638a81dcf2f7000c1f9818a73d764fe Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 04:01:05 +0200 Subject: [PATCH 54/55] Bump tins --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1787e781e..ca992d12a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -696,7 +696,7 @@ GEM timecop (0.9.1) timers (4.1.2) hitimes - tins (1.15.0) + tins (1.16.3) to_regexp (0.2.1) turbo_dev_assets (0.0.2) twitter (6.2.0) From 9a661177f169f33bb436e5e129bfaa5eb5726dea Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 8 Apr 2018 17:38:09 +0200 Subject: [PATCH 55/55] Replace rails-assets-perfect-scrollbar with rails-assets-utatti-perfect-scrollbar closes #7772 --- .eslintrc | 5 +-- Gemfile | 2 +- Gemfile.lock | 4 +-- app/assets/javascripts/app/app.js | 2 +- .../app/views/notification_dropdown_view.js | 15 ++++---- app/assets/stylesheets/_application.scss | 2 +- .../step_definitions/notifications_steps.rb | 2 +- .../views/notification_dropdown_view_spec.js | 35 ++++++++----------- 8 files changed, 30 insertions(+), 37 deletions(-) diff --git a/.eslintrc b/.eslintrc index 62ba89fda..977ea0396 100644 --- a/.eslintrc +++ b/.eslintrc @@ -10,16 +10,17 @@ "autosize": false, "Backbone": false, "Bloodhound": false, + "blueimp": false, "gon": false, "Handlebars": false, "HandlebarsTemplates": false, "ImagePaths": false, "jsxc": false, "L": false, - "Routes": false, "OSM": false, + "PerfectScrollbar": false, "qq": false, - "blueimp": false, + "Routes": false, "loginAs": true, "logout": true, diff --git a/Gemfile b/Gemfile index 82291f0bc..faa3cca85 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-perfect-scrollbar", "0.6.16" + gem "rails-assets-utatti-perfect-scrollbar", "1.3.0" end gem "markdown-it-html5-embed", "1.0.0" diff --git a/Gemfile.lock b/Gemfile.lock index ca992d12a..3a9359908 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -553,8 +553,8 @@ 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-perfect-scrollbar (0.6.16) rails-assets-underscore (1.8.3) + rails-assets-utatti-perfect-scrollbar (1.3.0) rails-controller-testing (1.0.2) actionpack (~> 5.x, >= 5.0.1) actionview (~> 5.x, >= 5.0.1) @@ -867,7 +867,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-perfect-scrollbar (= 0.6.16)! + rails-assets-utatti-perfect-scrollbar (= 1.3.0)! rails-controller-testing (= 1.0.2) rails-i18n (= 5.1.1) rails-timeago (= 2.16.0) diff --git a/app/assets/javascripts/app/app.js b/app/assets/javascripts/app/app.js index 1360e952e..c0ee09de5 100644 --- a/app/assets/javascripts/app/app.js +++ b/app/assets/javascripts/app/app.js @@ -14,7 +14,7 @@ //= require_tree ./collections //= require_tree ./views -//= require perfect-scrollbar/perfect-scrollbar.jquery +//= require utatti-perfect-scrollbar/dist/perfect-scrollbar var app = { collections: {}, diff --git a/app/assets/javascripts/app/views/notification_dropdown_view.js b/app/assets/javascripts/app/views/notification_dropdown_view.js index 1d14cac08..0ae192564 100644 --- a/app/assets/javascripts/app/views/notification_dropdown_view.js +++ b/app/assets/javascripts/app/views/notification_dropdown_view.js @@ -12,7 +12,7 @@ app.views.NotificationDropdown = app.views.Base.extend({ this.dropdown = $("#notification-dropdown"); this.dropdownNotifications = this.dropdown.find(".notifications"); this.ajaxLoader = this.dropdown.find(".ajax-loader"); - this.perfectScrollbarInitialized = false; + this.perfectScrollbar = null; this.dropdownNotifications.scroll(this.dropdownScroll.bind(this)); this.bindCollectionEvents(); }, @@ -106,18 +106,17 @@ app.views.NotificationDropdown = app.views.Base.extend({ }, updateScrollbar: function() { - if(this.perfectScrollbarInitialized) { - this.dropdownNotifications.perfectScrollbar("update"); + if (this.perfectScrollbar) { + this.perfectScrollbar.update(); } else { - this.dropdownNotifications.perfectScrollbar(); - this.perfectScrollbarInitialized = true; + this.perfectScrollbar = new PerfectScrollbar(this.dropdownNotifications[0]); } }, destroyScrollbar: function() { - if(this.perfectScrollbarInitialized) { - this.dropdownNotifications.perfectScrollbar("destroy"); - this.perfectScrollbarInitialized = false; + if (this.perfectScrollbar) { + this.perfectScrollbar.destroy(); + this.perfectScrollbar = null; } } }); diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss index 983ea5151..91a94357d 100644 --- a/app/assets/stylesheets/_application.scss +++ b/app/assets/stylesheets/_application.scss @@ -1,4 +1,4 @@ -@import 'perfect-scrollbar'; +@import 'utatti-perfect-scrollbar/css/perfect-scrollbar'; @import 'color-variables'; @import 'bootstrap-complete'; diff --git a/features/step_definitions/notifications_steps.rb b/features/step_definitions/notifications_steps.rb index 11cb5efa7..9088dacc2 100644 --- a/features/step_definitions/notifications_steps.rb +++ b/features/step_definitions/notifications_steps.rb @@ -32,7 +32,7 @@ Then "the notification dropdown should be visible" do end Then "the notification dropdown scrollbar should be visible" do - expect(find(:css, ".ps-active-y")).to be_visible + expect(find(:css, ".ps--active-y")).to be_visible end Then /^there should be (\d+) notifications loaded$/ do |n| diff --git a/spec/javascripts/app/views/notification_dropdown_view_spec.js b/spec/javascripts/app/views/notification_dropdown_view_spec.js index 5a1452672..725ae0d57 100644 --- a/spec/javascripts/app/views/notification_dropdown_view_spec.js +++ b/spec/javascripts/app/views/notification_dropdown_view_spec.js @@ -73,41 +73,34 @@ describe("app.views.NotificationDropdown", function() { describe("updateScrollbar", function() { it("Initializes perfectScrollbar", function() { - this.view.perfectScrollbarInitialized = false; - spyOn($.fn, "perfectScrollbar"); + this.view.perfectScrollbar = null; + spyOn(window, "PerfectScrollbar"); this.view.updateScrollbar(); - expect($.fn.perfectScrollbar).toHaveBeenCalledWith(); - expect($.fn.perfectScrollbar.calls.mostRecent().object).toEqual(this.view.dropdownNotifications); - expect(this.view.perfectScrollbarInitialized).toBeTruthy(); + expect(window.PerfectScrollbar).toHaveBeenCalledWith(this.view.dropdownNotifications[0]); + expect(this.view.perfectScrollbar).not.toBeNull(); }); it("Updates perfectScrollbar", function() { - this.view.perfectScrollbarInitialized = true; - this.view.dropdownNotifications.perfectScrollbar(); - spyOn($.fn, "perfectScrollbar"); + this.view.perfectScrollbar = new PerfectScrollbar(this.view.dropdownNotifications[0]); + spyOn(this.view.perfectScrollbar, "update"); this.view.updateScrollbar(); - expect($.fn.perfectScrollbar).toHaveBeenCalledWith("update"); - expect($.fn.perfectScrollbar.calls.mostRecent().object).toEqual(this.view.dropdownNotifications); - expect(this.view.perfectScrollbarInitialized).toBeTruthy(); + expect(this.view.perfectScrollbar.update).toHaveBeenCalled(); }); }); describe("destroyScrollbar", function() { it("destroys perfectScrollbar", function() { - this.view.perfectScrollbarInitialized = true; - this.view.dropdownNotifications.perfectScrollbar(); - spyOn($.fn, "perfectScrollbar"); + this.view.perfectScrollbar = new PerfectScrollbar(this.view.dropdownNotifications[0]); + var spy = jasmine.createSpy(); + spyOn(this.view.perfectScrollbar, "destroy").and.callFake(spy); this.view.destroyScrollbar(); - expect($.fn.perfectScrollbar).toHaveBeenCalledWith("destroy"); - expect($.fn.perfectScrollbar.calls.mostRecent().object).toEqual(this.view.dropdownNotifications); - expect(this.view.perfectScrollbarInitialized).toBeFalsy(); + expect(spy).toHaveBeenCalled(); + expect(this.view.perfectScrollbar).toBeNull(); }); it("doesn't destroy perfectScrollbar if it isn't initialized", function() { - this.view.perfectScrollbarInitialized = false; - spyOn($.fn, "perfectScrollbar"); - this.view.destroyScrollbar(); - expect($.fn.perfectScrollbar).not.toHaveBeenCalled(); + this.view.perfectScrollbar = null; + expect(this.view.destroyScrollbar).not.toThrow(); }); });