Merge branch 'next-minor'

Author: SuperTux88

.github/workflows/ci.yml

@@ -15,8 +15,8 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
+          - 2.7
           - 2.6
-          - 2.5
         db:
           - mysql
           - postgresql

.gitignore

@@ -82,3 +82,9 @@ diaspora.iml
 
 # WebTranslateIt
 .wti
+
+# MacOS
+/__MACOSX/
+
+# yarn
+node_modules

.rubocop.yml

@@ -57,6 +57,12 @@ Layout/SpaceAroundEqualsInParameterDefault:
 # are needed.
 Style/StringLiterals:
   EnforcedStyle: double_quotes
+  Exclude:
+    # These files are generated by rails, so it's best to keep them close to the original for smaller diffs
+    - "config/application.rb"
+    - "config/boot.rb"
+    - "config/environment.rb"
+    - "config/environments/*.rb"
 
 # We do not need to support Ruby 1.9, so this is good to use.
 Style/SymbolArray:

.ruby-version

@@ -1 +1 @@
-2.6
+2.7

Changelog.md

@@ -1,3 +1,27 @@
+# 0.7.18.0
+
+## Refactor
+* Fix order-dependent jasmine test failures and switch to random order [#8333](https://github.com/diaspora/diaspora/pull/8333)
+* Get rid of some uses of "execute\_script" in feature specs [#8331](https://github.com/diaspora/diaspora/pull/8331)
+* Fix deprecation warnings for sidekiq 7.0 [#8359](https://github.com/diaspora/diaspora/pull/8359)
+* Remove entypo-rails dependency to prepare for rails 6 [#8361](https://github.com/diaspora/diaspora/pull/8361)
+* Remove compass-rails dependency which is not supported anymore [#8362](https://github.com/diaspora/diaspora/pull/8362)
+* Switch to sassc-rails which speeds up `assets:precompile` a lot [#8362](https://github.com/diaspora/diaspora/pull/8362)
+* Remove markerb dependency which doesn't exist anymore [#8365](https://github.com/diaspora/diaspora/pull/8365)
+* Upgrade to rails 6.1 [#8366](https://github.com/diaspora/diaspora/pull/8366)
+* Update the suggested Ruby version to 2.7. If you run into trouble during the update and you followed our installation guides, run `rvm install 2.7`. [#8366](https://github.com/diaspora/diaspora/pull/8366)
+* Upgrade to bundler 2 [#8366](https://github.com/diaspora/diaspora/pull/8366)
+* Stop checking `/.well-known/host-meta`, check for `/.well-known/nodeinfo` instead [#8377](https://github.com/diaspora/diaspora/pull/8377)
+* Handle NodeInfo timeouts gracefully [#8380](https://github.com/diaspora/diaspora/pull/8380)
+
+## Bug fixes
+* Fix that no mails were sent after photo export [#8365](https://github.com/diaspora/diaspora/pull/8365)
+* Fix people with quotes in the name causing issues with mail sender [#8365](https://github.com/diaspora/diaspora/pull/8365)
+
+## Features
+* Render posts and comments as HTML in HTML mails [#8365](https://github.com/diaspora/diaspora/pull/8365)
+* Add NodeInfo 2.1 support and also read newer versions of NodeInfo [#8379](https://github.com/diaspora/diaspora/pull/8379)
+
 # 0.7.17.0
 
 ## Security

Gemfile

@@ -2,103 +2,98 @@
 
 source "https://rubygems.org"
 
-gem "rails", "5.2.7.1"
+gem "rails", "6.1.6.1"
 
 # Legacy Rails features, remove me!
 # responders (class level)
 gem "responders", "3.0.1"
 
 # Appserver
 
-gem "unicorn", "6.0.0", require: false
+gem "unicorn", "6.1.0", require: false
 gem "unicorn-worker-killer", "0.4.5"
 
 # Federation
 
-gem "diaspora_federation-json_schema", "0.2.7"
-gem "diaspora_federation-rails", "0.2.7"
+gem "diaspora_federation-json_schema", "0.2.8"
+gem "diaspora_federation-rails", "0.2.8"
 
 # API and JSON
 
 gem "acts_as_api", "1.0.1"
-gem "json",        "2.3.0"
-gem "json-schema", "2.8.1"
+gem "json",        "2.6.2"
+gem "json-schema", "3.0.0"
 
 # Authentication
 
-gem "devise", "4.8.0"
+gem "devise", "4.8.1"
 gem "devise_lastseenable", "0.0.6"
-gem "devise-two-factor", "4.0.1"
-gem "rqrcode", "2.1.0"
+gem "devise-two-factor", "4.0.2"
+gem "rqrcode", "2.1.1"
 
 # Captcha
 
 gem "simple_captcha2", "0.5.0", require: "simple_captcha"
 
 # Background processing
 
-gem "redis", "4.5.1"
-gem "sidekiq", "6.2.2"
+gem "redis", "4.7.0"
+gem "sidekiq", "6.5.1"
 
 # Scheduled processing
 
-gem "sidekiq-cron", "1.2.0"
+gem "sidekiq-cron", "1.6.0"
 
 # Compression
 
-gem "terser", "1.1.7"
+gem "terser", "1.1.10"
 
 # Configuration
 
 gem "configurate", "0.5.0"
-gem "toml-rb", "2.1.0"
+gem "toml-rb", "2.1.2"
 
 # Cross-origin resource sharing
 
 gem "rack-cors", "1.1.1", require: "rack/cors"
 
 # CSS
 
-gem "autoprefixer-rails",     "10.3.3.0"
+gem "autoprefixer-rails",     "10.4.7.0"
 gem "bootstrap-sass",         "3.4.1"
 gem "bootstrap-switch-rails", "3.3.3" # 3.3.4 and 3.3.5 is broken, see https://github.com/Bttstrp/bootstrap-switch/issues/691
-gem "compass-rails",          "3.1.0"
-gem "sass-rails",             "5.0.7"
-gem "sprockets-rails",        "3.2.2"
+gem "sassc-rails",            "2.1.2"
+gem "sprockets-rails",        "3.4.2"
 
 # Database
 
 group :mysql, optional: true do
-  gem "mysql2", "0.5.3"
+  gem "mysql2", "0.5.4"
 end
 group :postgresql, optional: true do
-  gem "pg",     "1.2.3"
+  gem "pg",     "1.4.1"
 end
 
-gem "activerecord-import", "1.1.0"
+gem "activerecord-import", "1.4.0"
 
 # File uploading
 
 gem "carrierwave", "2.2.2"
-gem "fog-aws",     "3.12.0"
+gem "fog-aws",     "3.14.0"
 gem "mini_magick", "4.11.0"
 
 # GUID generation
 gem "uuid", "2.3.9"
 
-# Icons
-
-gem "entypo-rails", "3.0.0"
-
 # JavaScript
 
 gem "handlebars_assets", "0.23.9"
-gem "jquery-rails",      "4.4.0"
-gem "js-routes",         "2.1.2"
-gem "js_image_paths",    "0.1.1"
+gem "jquery-rails",      "4.5.0"
+gem "js_image_paths",    "0.2.0"
+gem "js-routes",         "2.2.4"
 
 source "https://gems.diasporafoundation.org" do
-  gem "rails-assets-jquery",                              "3.5.1" # Should be kept in sync with jquery-rails
+  gem "rails-assets-jquery",                              "3.6.0" # Should be kept in sync with jquery-rails
   gem "rails-assets-jquery.ui",                           "1.11.4"
 
   gem "rails-assets-highlightjs",                         "9.12.0"
@@ -112,6 +107,7 @@ source "https://gems.diasporafoundation.org" do
   gem "rails-assets-markdown-it-sup",                     "1.0.0"
 
   gem "rails-assets-backbone",                            "1.3.3"
+  gem "rails-assets-bootstrap",                           "3.4.1"
   gem "rails-assets-bootstrap-markdown",                  "2.10.0"
   gem "rails-assets-corejs-typeahead",                    "1.2.1"
   gem "rails-assets-fine-uploader",                       "5.13.0"
@@ -132,21 +128,17 @@ 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.3"
-
-# Mail
-
-gem "markerb",             "1.1.0"
+gem "rails-i18n",           "6.0.0"
 
 # Map
 gem "leaflet-rails",       "1.7.0"
 
 # Parsing
 
-gem "nokogiri",          "1.12.5"
+gem "nokogiri",          "1.13.7"
 gem "open_graph_reader", "0.7.2" # also update User-Agent in features/support/webmock.rb and open_graph_cache_spec.rb
 gem "redcarpet",         "3.5.1"
-gem "ruby-oembed",       "0.15.0"
+gem "ruby-oembed",       "0.16.1"
 gem "twitter-text",      "1.14.7"
 
 # RTL support
@@ -159,8 +151,8 @@ gem "secure_headers", "6.3.3"
 
 # Services
 
-gem "omniauth",                       "2.0.4"
-gem "omniauth-rails_csrf_protection", "1.0.0"
+gem "omniauth",                       "2.1.0"
+gem "omniauth-rails_csrf_protection", "1.0.1"
 gem "omniauth-tumblr",                "1.2"
 gem "omniauth-twitter",               "1.4.0"
 gem "omniauth-wordpress",             "0.2.2"
@@ -171,30 +163,30 @@ gem "openid_connect", "1.3.0"
 
 # Serializers
 
-gem "active_model_serializers", "0.9.7"
+gem "active_model_serializers", "0.9.8"
 
 # XMPP chat dependencies
 gem "diaspora-prosody-config",    "0.0.7"
 gem "rails-assets-diaspora_jsxc", "0.1.5.develop.7", source: "https://gems.diasporafoundation.org"
 
 # Tags
 
-gem "acts-as-taggable-on", "8.1.0"
+gem "acts-as-taggable-on", "9.0.1"
 
 # URIs and HTTP
 
 gem "addressable",        "2.8.0", require: "addressable/uri"
-gem "faraday",            "0.17.4"
+gem "faraday",            "0.17.5"
 gem "faraday-cookie_jar", "0.0.7"
 gem "faraday_middleware", "0.14.0"
 gem "typhoeus",           "1.4.0"
 
 # Views
 
 gem "gon",                     "6.4.0"
-gem "hamlit",                  "2.15.1"
+gem "hamlit",                  "2.16.0"
 gem "mobile-fu",               "1.4.0"
-gem "rails-timeago",           "2.19.1"
+gem "rails-timeago",           "2.20.0"
 gem "will_paginate",           "3.3.1"
 
 # Logging
@@ -210,7 +202,7 @@ gem "rubyzip", "2.3.2", require: "zip"
 # https://github.com/gitlabhq/gitlabhq/issues/3826
 # https://github.com/gitlabhq/gitlabhq/pull/3852
 # https://github.com/discourse/discourse/pull/238
-gem "minitest"
+gem "minitest",  "5.15.0"
 
 gem "versionist", "2.0.1"
 
@@ -238,15 +230,15 @@ group :production do # we don"t install these on travis to speed up test runs
 
   # Third party asset hosting
 
-  gem "asset_sync", "2.15.0", require: false
+  gem "asset_sync", "2.15.2", require: false
 end
 
 group :development do
   # Linters
-  gem "haml_lint",      "0.37.1", require: false
+  gem "haml_lint",      "0.40.0", require: false
   gem "pronto",         "0.11.0", require: false
   gem "pronto-eslint",  "0.11.0", require: false
-  gem "pronto-haml",    "0.11.0", require: false
+  gem "pronto-haml",    "0.11.1", require: false
   gem "pronto-rubocop", "0.11.1", require: false
   gem "pronto-scss",    "0.11.0", require: false
   gem "rubocop",        "0.93.1", require: false
@@ -261,15 +253,14 @@ group :development do
 
   gem "turbo_dev_assets", "0.0.2"
 
-  gem "listen", "3.5.1"
+  gem "listen", "3.7.1"
 end
 
 group :test do
   # RSpec (unit tests, some integration tests)
 
   gem "fixture_builder",   "0.5.2"
   gem "fuubar",            "2.5.1"
-  gem "json-schema-rspec", "0.0.4"
   gem "rspec-json_expectations", "~> 2.1"
 
   # Cucumber (integration tests)
@@ -284,18 +275,18 @@ group :test do
 
   gem "factory_girl_rails", "4.9.0"
   gem "shoulda-matchers",   "4.5.1"
-  gem "timecop",            "0.9.4"
+  gem "timecop",            "0.9.5"
   gem "webmock",            "3.14.0", require: false
 
-  gem "diaspora_federation-test", "0.2.7"
+  gem "diaspora_federation-test", "0.2.8"
 end
 
 group :development, :test do
   # RSpec (unit tests, some integration tests)
-  gem "rspec-rails", "5.0.2"
+  gem "rspec-rails", "5.1.2"
 
   # Cucumber (integration tests)
-  gem "cucumber-rails", "2.4.0", require: false
+  gem "cucumber-rails", "2.5.1", require: false
 
   # Jasmine (client side application tests (JS))
   gem "chrome_remote",             "0.3.0"