Merge branch 'release/0.7.14.0'

diaspora · Jun 14, 2020 · 4ca68a7 · 4ca68a7
2 parents c2a991f + 3c124ce
commit 4ca68a7
Show file tree

Hide file tree

Showing 18 changed files with 805 additions and 270 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -12,7 +12,7 @@ Rails/HttpPositionalArguments:
   Enabled: false
 
 # Commonly used screens these days easily fit more than 80 characters.
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
 
 # Too short methods lead to extraction of single-use methods, which can make
@@ -62,7 +62,7 @@ Style/SymbolArray:
   Enabled: true
 
 # Most readable form.
-Layout/AlignHash:
+Layout/HashAlignment:
   EnforcedHashRocketStyle: table
   EnforcedColonStyle: table
 
@@ -84,7 +84,6 @@ Style/CollectionMethods:
     # inject seems more common in the community.
     reduce: "inject"
 
-
 # Either allow this style or don't. Marking it as safe with parenthesis
 # is silly. Let's try to live without them for now.
 Style/ParenthesesAroundCondition:
@@ -111,7 +110,7 @@ Style/SignalException:
 # Suppressing exceptions can be perfectly fine, and be it to avoid to
 # explicitly type nil into the rescue since that's what you want to return,
 # or suppressing LoadError for optional dependencies
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Enabled: false
 
 Layout/SpaceInsideBlockBraces:
@@ -174,3 +173,13 @@ Style/NumericPredicate:
 # Reset some HoundCI changes back to Rubocop defaults
 Layout/DotPosition:
   EnforcedStyle: leading
+
+# Not enabled by default but good
+Style/HashEachMethods:
+  Enabled: true
+
+# TODO: Enable with Ruby 2.5
+Style/HashTransformKeys:
+  Enabled: false
+Style/HashTransformValues:
+  Enabled: false
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.4
+2.6
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,8 @@
 language: ruby
 
 rvm:
-  - 2.4.2
-  - 2.3.5
+  - 2.6.6
+  - 2.5.8
 
 env:
   - DB=postgresql BUILD_TYPE=cucumber

diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,14 @@
+# 0.7.14.0
+
+## Refactor
+* Update the suggested Ruby version to 2.6. If you run into trouble during the update and you followed our installation guides, run `rvm install 2.6`. [#7929](https://github.com/diaspora/diaspora/pull/7929)
+
+## Bug fixes
+* Don't link to deleted users in admin user stats [#8063](https://github.com/diaspora/diaspora/pull/8063)
+* Properly validate a profile's gender field length instead of failing with a database error. [#8127](https://github.com/diaspora/diaspora/pull/8127)
+
+## Features
+
 # 0.7.13.0
 
 ## Security

diff --git a/Gemfile b/Gemfile
@@ -2,15 +2,15 @@
 
 source "https://rubygems.org"
 
-gem "rails", "5.2.4.1"
+gem "rails", "5.2.4.3"
 
 # Legacy Rails features, remove me!
 # responders (class level)
 gem "responders", "2.4.1"
 
 # Appserver
 
-gem "unicorn", "5.5.1", require: false
+gem "unicorn", "5.5.3", require: false
 gem "unicorn-worker-killer", "0.4.4"
 
 # Federation
@@ -21,32 +21,32 @@ gem "diaspora_federation-rails", "0.2.6"
 # API and JSON
 
 gem "acts_as_api", "1.0.1"
-gem "json",        "2.2.0"
+gem "json",        "2.3.0"
 gem "json-schema", "2.8.1"
 
 # Authentication
 
 gem "devise", "4.7.1"
 gem "devise-two-factor", "3.0.3"
 gem "devise_lastseenable", "0.0.6"
-gem "rqrcode", "0.10.1"
+gem "rqrcode", "1.1.2"
 
 # Captcha
 
-gem "simple_captcha2", "0.4.3", require: "simple_captcha"
+gem "simple_captcha2", "0.5.0", require: "simple_captcha"
 
 # Background processing
 
 gem "redis", "3.3.5" # Pinned to 3.3.x because of https://github.com/antirez/redis/issues/4272
-gem "sidekiq", "5.2.7"
+gem "sidekiq", "5.2.8"
 
 # Scheduled processing
 
 gem "sidekiq-cron", "1.1.0"
 
 # Compression
 
-gem "uglifier", "4.1.20"
+gem "uglifier", "4.2.0"
 
 # Configuration
 
@@ -68,19 +68,19 @@ gem "sprockets-rails",        "3.2.1"
 # Database
 
 group :mysql, optional: true do
-  gem "mysql2", "0.5.2"
+  gem "mysql2", "0.5.3"
 end
 group :postgresql, optional: true do
-  gem "pg",     "1.1.4"
+  gem "pg",     "1.2.3"
 end
 
 
-gem "activerecord-import", "1.0.2"
+gem "activerecord-import", "1.0.4"
 
 # File uploading
 
 gem "carrierwave", "1.3.1"
-gem "fog-aws",     "3.5.1"
+gem "fog-aws",     "3.5.2"
 gem "mini_magick", "4.10.1"
 
 # GUID generation
@@ -92,9 +92,9 @@ gem "entypo-rails", "3.0.0"
 
 # JavaScript
 
-gem "handlebars_assets", "0.23.4"
+gem "handlebars_assets", "0.23.8"
 gem "jquery-rails",      "4.3.5"
-gem "js-routes",         "1.4.7"
+gem "js-routes",         "1.4.9"
 gem "js_image_paths",    "0.1.1"
 
 source "https://gems.diasporafoundation.org" do
@@ -138,31 +138,31 @@ gem "rails-i18n",           "5.1.3"
 gem "markerb",             "1.1.0"
 
 # Map
-gem "leaflet-rails",       "1.5.1"
+gem "leaflet-rails",       "1.6.0"
 
 # Parsing
 
-gem "nokogiri",          "1.10.8"
+gem "nokogiri",          "1.10.9"
 gem "open_graph_reader", "0.7.0" # also update User-Agent in features/support/webmock.rb
-gem "redcarpet",         "3.4.0"
+gem "redcarpet",         "3.5.0"
 gem "ruby-oembed",       "0.12.0"
 gem "twitter-text",      "1.14.7"
 
 # RTL support
 
-gem "string-direction", "1.2.1"
+gem "string-direction", "1.2.2"
 
 # Security Headers
 
 gem "secure_headers", "6.3.0"
 
 # Services
 
-gem "omniauth",           "1.9.0"
+gem "omniauth",           "1.9.1"
 gem "omniauth-tumblr",    "1.2"
 gem "omniauth-twitter",   "1.4.0"
 gem "omniauth-wordpress", "0.2.2"
-gem "twitter",            "6.2.0"
+gem "twitter",            "7.0.0"
 
 # OpenID Connect
 gem "openid_connect", "1.1.8"
@@ -177,23 +177,23 @@ gem "rails-assets-diaspora_jsxc", "0.1.5.develop.7", source: "https://gems.diasp
 
 # Tags
 
-gem "acts-as-taggable-on", "6.0.0"
+gem "acts-as-taggable-on", "6.5.0"
 
 # URIs and HTTP
 
-gem "addressable",        "2.6.0", require: "addressable/uri"
+gem "addressable",        "2.7.0", require: "addressable/uri"
 gem "faraday",            "0.15.4"
 gem "faraday_middleware", "0.13.1"
 gem "faraday-cookie_jar", "0.0.6"
 gem "typhoeus",           "1.3.1"
 
 # Views
 
-gem "gon",                     "6.2.1"
-gem "hamlit",                  "2.9.3"
+gem "gon",                     "6.3.2"
+gem "hamlit",                  "2.11.0"
 gem "mobile-fu",               "1.4.0"
-gem "rails-timeago",           "2.17.1"
-gem "will_paginate",           "3.1.7"
+gem "rails-timeago",           "2.18.0"
+gem "will_paginate",           "3.3.0"
 
 # Logging
 
@@ -210,7 +210,7 @@ gem "rubyzip", "1.3.0", require: "zip"
 # https://github.com/discourse/discourse/pull/238
 gem "minitest"
 
-gem "versionist", "2.0.0"
+gem "versionist", "2.0.1"
 
 # Windows and OSX have an execjs compatible runtime built-in, Linux users should
 # install Node.js or use "therubyracer".
@@ -236,30 +236,30 @@ group :production do # we don"t install these on travis to speed up test runs
 
   # Third party asset hosting
 
-  gem "asset_sync", "2.7.0", require: false
+  gem "asset_sync", "2.11.0", require: false
 end
 
 group :development do
   # Automatic test runs
-  gem "guard",          "2.15.0", require: false
+  gem "guard",          "2.16.1", require: false
   gem "guard-rspec",    "4.7.3", require: false
   gem "guard-rubocop",  "1.3.0", require: false
   gem "rb-fsevent",     "0.10.3", require: false
-  gem "rb-inotify",     "0.10.0", require: false
+  gem "rb-inotify",     "0.10.1", require: false
 
   # Linters
-  gem "haml_lint",      "0.28.0", require: false
+  gem "haml_lint",      "0.35.0", require: false
   gem "pronto",         "0.10.0", require: false
   gem "pronto-eslint",  "0.10.0", require: false
   gem "pronto-haml",    "0.10.0", require: false
   gem "pronto-rubocop", "0.10.0", require: false
   gem "pronto-scss",    "0.10.0", require: false
-  gem "rubocop",        "0.72.0", require: false
-  gem "rubocop-rails",  "2.1.0", require: false
+  gem "rubocop",        "0.80.1", require: false
+  gem "rubocop-rails",  "2.4.1", require: false
 
   # Preloading environment
 
-  gem "spring", "2.0.2"
+  gem "spring", "2.1.0"
   gem "spring-commands-rspec", "1.0.4"
   gem "spring-commands-cucumber", "1.0.1"
 
@@ -276,25 +276,25 @@ end
 group :test do
   # RSpec (unit tests, some integration tests)
 
-  gem "fixture_builder",   "0.5.2.rc3"
-  gem "fuubar",            "2.4.1"
+  gem "fixture_builder",   "0.5.2"
+  gem "fuubar",            "2.5.0"
   gem "json-schema-rspec", "0.0.4"
   gem "rspec-json_expectations", "~> 2.1"
 
   # Cucumber (integration tests)
 
   gem "capybara",           "3.15.0"
-  gem "database_cleaner",   "1.7.0"
+  gem "database_cleaner",   "1.8.3"
   gem "poltergeist",        "1.18.1"
 
   gem "cucumber-api-steps", "0.14", require: false
 
   # General helpers
 
-  gem "factory_girl_rails", "4.8.0"
+  gem "factory_girl_rails", "4.9.0"
   gem "shoulda-matchers",   "4.0.1"
   gem "timecop",            "0.9.1"
-  gem "webmock",            "3.6.0", require: false
+  gem "webmock",            "3.8.3", require: false
 
   gem "diaspora_federation-test", "0.2.6"
 
@@ -304,13 +304,13 @@ end
 
 group :development, :test do
   # RSpec (unit tests, some integration tests)
-  gem "rspec-rails", "3.8.2"
+  gem "rspec-rails", "3.9.1"
 
   # Cucumber (integration tests)
-  gem "cucumber-rails", "1.7.0", require: false
+  gem "cucumber-rails", "2.0.0", require: false
 
   # Jasmine (client side application tests (JS))
-  gem "jasmine",                   "3.4.0"
+  gem "jasmine",                   "3.5.1"
   gem "jasmine-jquery-rails",      "2.0.3"
   gem "rails-assets-jasmine-ajax", "4.0.0", source: "https://gems.diasporafoundation.org"
   gem "sinon-rails",               "1.15.0"