Merge branch 'next-minor'

.github/workflows/ci.yml

@@ -0,0 +1,63 @@
+name: CI
+on:
+  push:
+    branches:
+      - develop
+      - next-minor
+      - main
+      - master
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - 2.6
+          - 2.5
+        db:
+          - mysql
+          - postgresql
+        kind:
+          - cucumber
+          - other
+    env:
+      DB: ${{ matrix.db }}
+      RAILS_ENV: test
+      BUNDLE_WITH: ${{ matrix.db }}
+      BUNDLE_WITHOUT: development
+      BUNDLE_FROZEN: true
+      BUNDLE_DISABLE_SHARED_GEMS: true
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_PASSWORD: postgres
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+    steps:
+      - name: Install system dependencies
+        run: sudo apt-get install -y build-essential curl git gsfonts imagemagick libcurl4-openssl-dev libidn11-dev libmagickwand-dev libssl-dev libxml2-dev libxslt1-dev
+      - name: Start MySQL
+        run: sudo systemctl start mysql.service
+        if: matrix.db == 'mysql'
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Prepare
+        run: script/ci/prepare.sh
+      - name: Run tests
+        run: bin/rake --trace ci:${{ matrix.kind }}
+      - name: Run Jasmine
+        run: bin/rake jasmine:ci
+        timeout-minutes: 2
+        if: matrix.kind == 'other'

.gitignore

@@ -9,6 +9,7 @@ app/views/terms/terms.*
 app/assets/images/custom/
 
 # Configuration files
+config/diaspora.toml
 config/diaspora.yml
 config/initializers/secret_token.rb
 .bundle

.rubocop.yml

@@ -1,7 +1,8 @@
 require: rubocop-rails
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.6
+  NewCops: enable
   Exclude:
     - "bin/**/*"
     - "db/schema.rb"

Changelog.md

@@ -1,3 +1,22 @@
+# 0.7.15.0
+
+## Refactor
+* Replaced some `http://` links in the UI with their `https://` counterparts [#8207](https://github.com/diaspora/diaspora/pull/8207)
+* Testing: Replaced phantomjs with headless Chrome/Chromium [#8234](https://github.com/diaspora/diaspora/pull/8234)
+
+## Bug fixes
+* Update comment counter when weleting a comment in the Single Post View [#7938](https://github.com/diaspora/diaspora/pull/7938)
+* Link diaspora only poduptime list [#8174](https://github.com/diaspora/diaspora/pull/8174)
+* Delete a user's invitation code during account deletion [#8202](https://github.com/diaspora/diaspora/pull/8202)
+* Bump mimemagic [#8231](https://github.com/diaspora/diaspora/pull/8231)
+* Removed support for defunct Uni Heidelberg OSM tile server, Mapbox is now required if you want to show maps [#8215](https://github.com/diaspora/diaspora/pull/8215)
+* Render only two fractional digits in the posts per user/day admin statistics [#8227](https://github.com/diaspora/diaspora/pull/8227)
+* Make aspect dropdowns scrollable [#8213](https://github.com/diaspora/diaspora/pull/8213)
+* Fix `Photo#ownserhip_of_status_message` validation [#8214](https://github.com/diaspora/diaspora/pull/8214)
+
+## Features
+* Support and recommend TOML as configuration format [#8132](https://github.com/diaspora/diaspora/pull/8132)
+
 # 0.7.14.0
 
 ## Refactor

Gemfile

@@ -2,16 +2,16 @@
 
 source "https://rubygems.org"
 
-gem "rails", "5.2.4.3"
+gem "rails", "5.2.5"
 
 # Legacy Rails features, remove me!
 # responders (class level)
-gem "responders", "2.4.1"
+gem "responders", "3.0.1"
 
 # Appserver
 
-gem "unicorn", "5.5.3", require: false
-gem "unicorn-worker-killer", "0.4.4"
+gem "unicorn", "6.0.0", require: false
+gem "unicorn-worker-killer", "0.4.5"
 
 # Federation
 
@@ -26,8 +26,8 @@ gem "json-schema", "2.8.1"
 
 # Authentication
 
-gem "devise", "4.7.1"
-gem "devise-two-factor", "3.0.3"
+gem "devise", "4.7.3"
+gem "devise-two-factor", "4.0.0"
 gem "devise_lastseenable", "0.0.6"
 gem "rqrcode", "1.1.2"
 
@@ -37,30 +37,31 @@ 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.8"
+gem "redis", "4.2.5"
+gem "sidekiq", "6.2.1"
 
 # Scheduled processing
 
-gem "sidekiq-cron", "1.1.0"
+gem "sidekiq-cron", "1.2.0"
 
 # Compression
 
 gem "uglifier", "4.2.0"
 
 # Configuration
 
-gem "configurate", "0.3.1"
+gem "configurate", "0.5.0"
+gem "toml-rb", "2.0.1"
 
 # Cross-origin resource sharing
 
 gem "rack-cors", "1.1.1", require: "rack/cors"
 
 # CSS
 
-gem "autoprefixer-rails",     "8.6.5"
+gem "autoprefixer-rails",     "10.2.4.0"
 gem "bootstrap-sass",         "3.4.1"
-gem "bootstrap-switch-rails", "3.3.3" # 3.3.4 is broken, see https://github.com/Bttstrp/bootstrap-switch/issues/691
+gem "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.1"
@@ -79,7 +80,7 @@ gem "activerecord-import", "1.0.4"
 
 # File uploading
 
-gem "carrierwave", "1.3.1"
+gem "carrierwave", "1.3.2"
 gem "fog-aws",     "3.5.2"
 gem "mini_magick", "4.10.1"
 
@@ -142,9 +143,9 @@ gem "leaflet-rails",       "1.6.0"
 
 # Parsing
 
-gem "nokogiri",          "1.10.9"
-gem "open_graph_reader", "0.7.0" # also update User-Agent in features/support/webmock.rb
-gem "redcarpet",         "3.5.0"
+gem "nokogiri",          "1.11.3"
+gem "open_graph_reader", "0.7.1" # also update User-Agent in features/support/webmock.rb and open_graph_cache_spec.rb
+gem "redcarpet",         "3.5.1"
 gem "ruby-oembed",       "0.12.0"
 gem "twitter-text",      "1.14.7"
 
@@ -154,7 +155,7 @@ gem "string-direction", "1.2.2"
 
 # Security Headers
 
-gem "secure_headers", "6.3.0"
+gem "secure_headers", "6.3.2"
 
 # Services
 
@@ -185,12 +186,12 @@ 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"
+gem "typhoeus",           "1.4.0"
 
 # Views
 
 gem "gon",                     "6.3.2"
-gem "hamlit",                  "2.11.0"
+gem "hamlit",                  "2.14.6"
 gem "mobile-fu",               "1.4.0"
 gem "rails-timeago",           "2.18.0"
 gem "will_paginate",           "3.3.0"
@@ -201,7 +202,7 @@ gem "logging-rails", "0.6.0", require: "logging/rails"
 
 # Reading and writing zip files
 
-gem "rubyzip", "1.3.0", require: "zip"
+gem "rubyzip", "2.3.0", require: "zip"
 
 # Prevent occasions where minitest is not bundled in
 # packaged versions of ruby. See following issues/prs:
@@ -240,77 +241,64 @@ group :production do # we don"t install these on travis to speed up test runs
 end
 
 group :development do
-  # Automatic test runs
-  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.1", require: false
-
   # Linters
-  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.80.1", require: false
-  gem "rubocop-rails",  "2.4.1", require: false
-
-  # Preloading environment
-
-  gem "spring", "2.1.0"
-  gem "spring-commands-rspec", "1.0.4"
-  gem "spring-commands-cucumber", "1.0.1"
+  gem "haml_lint",      "0.37.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-rubocop", "0.11.1", require: false
+  gem "pronto-scss",    "0.11.0", require: false
+  gem "rubocop",        "0.93.1", require: false
+  gem "rubocop-rails",  "2.9.1", require: false
 
   # Debugging
   gem "pry"
   gem "pry-byebug"
 
   # test coverage
-  gem "simplecov", "0.16.1", require: false
+  gem "simplecov", "0.21.2", require: false
 
   gem "turbo_dev_assets", "0.0.2"
+
+  gem "listen", "3.5.1"
 end
 
 group :test do
   # RSpec (unit tests, some integration tests)
 
   gem "fixture_builder",   "0.5.2"
-  gem "fuubar",            "2.5.0"
+  gem "fuubar",            "2.5.1"
   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.8.3"
-  gem "poltergeist",        "1.18.1"
+  gem "apparition",       "0.6.0"
+  gem "capybara",         "3.35.3"
+  gem "database_cleaner-active_record", "1.8.0"
 
   gem "cucumber-api-steps", "0.14", require: false
 
   # General helpers
 
   gem "factory_girl_rails", "4.9.0"
-  gem "shoulda-matchers",   "4.0.1"
-  gem "timecop",            "0.9.1"
-  gem "webmock",            "3.8.3", require: false
+  gem "shoulda-matchers",   "4.5.1"
+  gem "timecop",            "0.9.4"
+  gem "webmock",            "3.12.2", require: false
 
   gem "diaspora_federation-test", "0.2.6"
-
-  # Coverage
-  gem "coveralls", "0.8.23", require: false
 end
 
 group :development, :test do
   # RSpec (unit tests, some integration tests)
-  gem "rspec-rails", "3.9.1"
+  gem "rspec-rails", "5.0.1"
 
   # Cucumber (integration tests)
-  gem "cucumber-rails", "2.0.0", require: false
+  gem "cucumber-rails", "2.3.0", require: false
 
   # Jasmine (client side application tests (JS))
-  gem "jasmine",                   "3.5.1"
+  gem "chrome_remote",             "0.3.0"
+  gem "jasmine",                   "3.7.0"
   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"