]> cat aescling's git repositories - mastodon.git/log
mastodon.git
4 years agoAdd zh-CN translations
Julianne420 [Sat, 25 Sep 2021 07:30:51 +0000 (15:30 +0800)]
Add zh-CN translations

4 years agoMerge pull request #1616 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Wed, 6 Oct 2021 16:02:18 +0000 (18:02 +0200)]
Merge pull request #1616 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years ago[Glitch] Improve hover and focus style in columns settings
Mélanie Chauvel [Thu, 30 Sep 2021 22:55:51 +0000 (00:55 +0200)]
[Glitch] Improve hover and focus style in columns settings

Port 900481b7fa638119b826ed888fc8eaca962ecf55 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Wed, 6 Oct 2021 14:46:32 +0000 (16:46 +0200)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoFix media attachment size validation not correctly accounting for file type (#16819)
Claire [Wed, 6 Oct 2021 13:49:32 +0000 (15:49 +0200)]
Fix media attachment size validation not correctly accounting for file type (#16819)

* Fix media attachment size validation not correctly accounting for file type

Fixes a regression introduced in #16724 caused by the fact that kt-paperclip
now correctly runs validations before processing, meaning that file size
verification could not rely on our before_post_processing hook.

Moved the `before_post_processing` hooks to `before_validate` to make sure
the media attachment type is set correctly before the file gets validated.

* Add tests

4 years agoImprove hover and focus style in columns settings (#16222)
Mélanie Chauvel [Thu, 30 Sep 2021 22:55:51 +0000 (00:55 +0200)]
Improve hover and focus style in columns settings (#16222)

* Make focus visible on switches and text buttons in columns settings

* Make hover/focus visible on left/right arrows in columns settings

Use same style as for station action bar (reply/boost/fav/etc.)

* Tab first to “Pin/Unpin” before left/right arrows in columns settings

4 years agoFix clicking on account name in “[xxx] boosted” text leading to broken path
Claire [Thu, 30 Sep 2021 09:47:58 +0000 (11:47 +0200)]
Fix clicking on account name in “[xxx] boosted” text leading to broken path

4 years agoMerge pull request #1613 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Thu, 30 Sep 2021 10:30:48 +0000 (12:30 +0200)]
Merge pull request #1613 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Thu, 30 Sep 2021 09:45:13 +0000 (11:45 +0200)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoFix webauthn secure key authentication (#16792)
Claire [Thu, 30 Sep 2021 03:26:29 +0000 (05:26 +0200)]
Fix webauthn secure key authentication (#16792)

* Add tests

* Fix webauthn secure key authentication

Fixes #16769

4 years agoFix drawer tab menu routes in advanced web ui (#16793)
Mashiro [Thu, 30 Sep 2021 03:19:08 +0000 (11:19 +0800)]
Fix drawer tab menu routes in advanced web ui (#16793)

4 years agoBump bufferutil from 4.0.3 to 4.0.4 (#16783)
dependabot[bot] [Thu, 30 Sep 2021 03:17:46 +0000 (12:17 +0900)]
Bump bufferutil from 4.0.3 to 4.0.4 (#16783)

Bumps [bufferutil](https://github.com/websockets/bufferutil) from 4.0.3 to 4.0.4.
- [Release notes](https://github.com/websockets/bufferutil/releases)
- [Commits](https://github.com/websockets/bufferutil/compare/v4.0.3...v4.0.4)

---
updated-dependencies:
- dependency-name: bufferutil
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump jest from 27.2.0 to 27.2.3 (#16795)
dependabot[bot] [Thu, 30 Sep 2021 03:17:33 +0000 (12:17 +0900)]
Bump jest from 27.2.0 to 27.2.3 (#16795)

Bumps [jest](https://github.com/facebook/jest) from 27.2.0 to 27.2.3.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v27.2.0...v27.2.3)

---
updated-dependencies:
- dependency-name: jest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoMerge pull request #1612 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Wed, 29 Sep 2021 22:29:38 +0000 (00:29 +0200)]
Merge pull request #1612 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Wed, 29 Sep 2021 22:01:20 +0000 (00:01 +0200)]
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/models/custom_emoji.rb`:
  Slight refactor upstream, next to a line that was different in glitch-soc
  because of our local configurable limits on custom emoji size.
  Ported upstream changes.
- `yarn.lock`:
  Not really a conflict, upstream dependency textually too close to a
  glitch-soc-only dependency.
  Updated upstream dependency as upstream.

4 years agoSwitch from unmaintained paperclip to kt-paperclip (#16724)
Claire [Wed, 29 Sep 2021 21:52:36 +0000 (23:52 +0200)]
Switch from unmaintained paperclip to kt-paperclip (#16724)

* Switch from unmaintained paperclip to kt-paperclip

* Drop some compatibility monkey-patches not required by kt-paperclip

* Drop media spoof check monkey-patching

It's broken with kt-paperclip and hopefully it won't be needed anymore

* Fix regression introduced by paperclip 6.1.0

* Do not rely on pathname to call FastImage

* Add test for ogg vorbis file with cover art

* Add audio/vorbis to the accepted content-types

This seems erroneous as this would be the content-type for a vorbis stream
without an ogg container, but that's what the `marcel` gem outputs, so…

* Restore missing for_as_default method

* Refactor Attachmentable concern and delay Paperclip's content-type spoof check

Check for content-type spoofing *after* setting the extension ourselves, this
fixes a regression with kt-paperclip's validations being more strict than
paperclip 6.0.0 and rejecting some Pleroma uploads because of unknown
extensions.

* Please CodeClimate

* Add audio/vorbis to the unreliable set

It doesn't correspond to a file format and thus has no extension associated.

4 years agoBump aws-sdk-s3 from 1.102.0 to 1.103.0 (#16756)
dependabot[bot] [Wed, 29 Sep 2021 13:03:59 +0000 (22:03 +0900)]
Bump aws-sdk-s3 from 1.102.0 to 1.103.0 (#16756)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.102.0 to 1.103.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump bootsnap from 1.8.1 to 1.9.1 (#16759)
dependabot[bot] [Wed, 29 Sep 2021 13:03:43 +0000 (22:03 +0900)]
Bump bootsnap from 1.8.1 to 1.9.1 (#16759)

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.8.1 to 1.9.1.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.8.1...v1.9.1)

---
updated-dependencies:
- dependency-name: bootsnap
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump eslint-plugin-react from 7.25.1 to 7.26.0 (#16784)
dependabot[bot] [Wed, 29 Sep 2021 13:03:12 +0000 (22:03 +0900)]
Bump eslint-plugin-react from 7.25.1 to 7.26.0 (#16784)

Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.25.1 to 7.26.0.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.25.1...v7.26.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-react
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump parallel_tests from 3.7.1 to 3.7.3 (#16754)
dependabot[bot] [Wed, 29 Sep 2021 13:02:46 +0000 (22:02 +0900)]
Bump parallel_tests from 3.7.1 to 3.7.3 (#16754)

Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 3.7.1 to 3.7.3.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md)
- [Commits](https://github.com/grosser/parallel_tests/compare/v3.7.1...v3.7.3)

---
updated-dependencies:
- dependency-name: parallel_tests
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump webpacker from 5.4.2 to 5.4.3 (#16757)
dependabot[bot] [Wed, 29 Sep 2021 13:02:20 +0000 (22:02 +0900)]
Bump webpacker from 5.4.2 to 5.4.3 (#16757)

Bumps [webpacker](https://github.com/rails/webpacker) from 5.4.2 to 5.4.3.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v5.4.2...v5.4.3)

---
updated-dependencies:
- dependency-name: webpacker
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump nokogiri from 1.12.4 to 1.12.5 (#16775)
dependabot[bot] [Wed, 29 Sep 2021 13:01:30 +0000 (22:01 +0900)]
Bump nokogiri from 1.12.4 to 1.12.5 (#16775)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.12.4 to 1.12.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.12.4...v1.12.5)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump tzinfo-data from 1.2021.1 to 1.2021.2 (#16776)
dependabot[bot] [Wed, 29 Sep 2021 13:01:14 +0000 (22:01 +0900)]
Bump tzinfo-data from 1.2021.1 to 1.2021.2 (#16776)

Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2021.1 to 1.2021.2.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases)
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2021.1...v1.2021.2)

---
updated-dependencies:
- dependency-name: tzinfo-data
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump sidekiq-unique-jobs from 7.1.5 to 7.1.7 (#16777)
dependabot[bot] [Wed, 29 Sep 2021 13:00:52 +0000 (22:00 +0900)]
Bump sidekiq-unique-jobs from 7.1.5 to 7.1.7 (#16777)

Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 7.1.5 to 7.1.7.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases)
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.1.5...v7.1.7)

---
updated-dependencies:
- dependency-name: sidekiq-unique-jobs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump doorkeeper from 5.5.2 to 5.5.3 (#16778)
dependabot[bot] [Wed, 29 Sep 2021 13:00:33 +0000 (22:00 +0900)]
Bump doorkeeper from 5.5.2 to 5.5.3 (#16778)

Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.5.2 to 5.5.3.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/main/CHANGELOG.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.5.2...v5.5.3)

---
updated-dependencies:
- dependency-name: doorkeeper
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump json-ld from 3.1.9 to 3.1.10 (#16779)
dependabot[bot] [Wed, 29 Sep 2021 12:56:40 +0000 (21:56 +0900)]
Bump json-ld from 3.1.9 to 3.1.10 (#16779)

Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.9 to 3.1.10.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases)
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.9...3.1.10)

---
updated-dependencies:
- dependency-name: json-ld
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump glob from 7.1.7 to 7.2.0 (#16782)
dependabot[bot] [Wed, 29 Sep 2021 12:56:18 +0000 (21:56 +0900)]
Bump glob from 7.1.7 to 7.2.0 (#16782)

Bumps [glob](https://github.com/isaacs/node-glob) from 7.1.7 to 7.2.0.
- [Release notes](https://github.com/isaacs/node-glob/releases)
- [Changelog](https://github.com/isaacs/node-glob/blob/master/changelog.md)
- [Commits](https://github.com/isaacs/node-glob/compare/v7.1.7...v7.2.0)

---
updated-dependencies:
- dependency-name: glob
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump autoprefixer from 9.8.6 to 9.8.7 (#16785)
dependabot[bot] [Wed, 29 Sep 2021 12:55:50 +0000 (21:55 +0900)]
Bump autoprefixer from 9.8.6 to 9.8.7 (#16785)

Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.8.6 to 9.8.7.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/9.8.7/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/9.8.6...9.8.7)

---
updated-dependencies:
- dependency-name: autoprefixer
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump utf-8-validate from 5.0.5 to 5.0.6 (#16786)
dependabot[bot] [Wed, 29 Sep 2021 12:55:37 +0000 (21:55 +0900)]
Bump utf-8-validate from 5.0.5 to 5.0.6 (#16786)

Bumps [utf-8-validate](https://github.com/websockets/utf-8-validate) from 5.0.5 to 5.0.6.
- [Release notes](https://github.com/websockets/utf-8-validate/releases)
- [Commits](https://github.com/websockets/utf-8-validate/compare/v5.0.5...v5.0.6)

---
updated-dependencies:
- dependency-name: utf-8-validate
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump babel-jest from 27.2.0 to 27.2.2 (#16787)
dependabot[bot] [Wed, 29 Sep 2021 12:55:23 +0000 (21:55 +0900)]
Bump babel-jest from 27.2.0 to 27.2.2 (#16787)

Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 27.2.0 to 27.2.2.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v27.2.2/packages/babel-jest)

---
updated-dependencies:
- dependency-name: babel-jest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump @testing-library/react from 12.1.0 to 12.1.1 (#16788)
dependabot[bot] [Wed, 29 Sep 2021 12:54:55 +0000 (21:54 +0900)]
Bump @testing-library/react from 12.1.0 to 12.1.1 (#16788)

Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 12.1.0 to 12.1.1.
- [Release notes](https://github.com/testing-library/react-testing-library/releases)
- [Changelog](https://github.com/testing-library/react-testing-library/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testing-library/react-testing-library/compare/v12.1.0...v12.1.1)

---
updated-dependencies:
- dependency-name: "@testing-library/react"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump yargs from 17.1.1 to 17.2.1 (#16790)
dependabot[bot] [Wed, 29 Sep 2021 12:54:41 +0000 (21:54 +0900)]
Bump yargs from 17.1.1 to 17.2.1 (#16790)

Bumps [yargs](https://github.com/yargs/yargs) from 17.1.1 to 17.2.1.
- [Release notes](https://github.com/yargs/yargs/releases)
- [Changelog](https://github.com/yargs/yargs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/yargs/yargs/compare/v17.1.1...v17.2.1)

---
updated-dependencies:
- dependency-name: yargs
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoMerge pull request #1609 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Tue, 28 Sep 2021 12:10:30 +0000 (14:10 +0200)]
Merge pull request #1609 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoFixup style issue
Claire [Tue, 28 Sep 2021 11:24:34 +0000 (13:24 +0200)]
Fixup style issue

4 years ago[Glitch] Fix incorrect use of old WebUI paths
Claire [Mon, 27 Sep 2021 05:24:04 +0000 (07:24 +0200)]
[Glitch] Fix incorrect use of old WebUI paths

Port 6b19e1e632491117bb1d3458fff31cd353b761b7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years ago[Glitch] Add aliases for WebUI routes that were renamed in #16171
Claire [Mon, 27 Sep 2021 05:23:48 +0000 (07:23 +0200)]
[Glitch] Add aliases for WebUI routes that were renamed in #16171

Port 11502ae46e4813bc23aeb5d03093a01d53991ab8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Tue, 28 Sep 2021 10:37:54 +0000 (12:37 +0200)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoFix incorrect use of old WebUI paths (#16773)
Claire [Mon, 27 Sep 2021 05:24:04 +0000 (07:24 +0200)]
Fix incorrect use of old WebUI paths (#16773)

* Fix incorrect use of old WebUI paths

PR #16171 renamed some routes but missed some occurrences.
Without #16772, this leads to unreachable routes in those cases.

* Fix floating action button being displayed on statuses and compose screen

4 years agoAdd aliases for WebUI routes that were renamed in #16171 (#16772)
Claire [Mon, 27 Sep 2021 05:23:48 +0000 (07:23 +0200)]
Add aliases for WebUI routes that were renamed in #16171 (#16772)

* Add aliases for some WebUI routes that were renamed in #16171

Accounts and statuses routes need more work as they use different parameters.

* Add aliases for /statuses/* routes

* Add aliases for /accounts/* WebUI routes

Does not correctly set the “active” state on the navigation tabs but this is
a minor issue.

* Fix some routes

* Fix /accounts/:id/{media,followers,following} not loading on legacy routes

4 years ago[Glitch] Change routing paths to use usernames in web UI
Eugen Rochko [Sun, 26 Sep 2021 03:46:13 +0000 (05:46 +0200)]
[Glitch] Change routing paths to use usernames in web UI

Port 52e5c07948c4c91b73062846e1f19ea278ec0e24 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Sun, 26 Sep 2021 16:28:59 +0000 (18:28 +0200)]
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `streaming/index.js`:
  Filtering code for streaming notifications has been refactored upstream, but
  glitch-soc had similar code for local-only toots in the same places.
  Ported upstream changes, but did not refactor local-only filtering.

4 years agoRefactor notifications to go through a separate stream in streaming API (#16765)
Eugen Rochko [Sun, 26 Sep 2021 11:23:28 +0000 (13:23 +0200)]
Refactor notifications to go through a separate stream in streaming API (#16765)

Eliminate need to have custom notifications filtering logic in the
streaming API code by publishing notifications into a separate stream
and then simply using the multi-stream capability to subscribe to that
stream when necessary

4 years agoChange routing paths to use usernames in web UI (#16171)
Eugen Rochko [Sun, 26 Sep 2021 03:46:13 +0000 (05:46 +0200)]
Change routing paths to use usernames in web UI (#16171)

4 years agoMerge pull request #1606 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Wed, 22 Sep 2021 15:27:15 +0000 (17:27 +0200)]
Merge pull request #1606 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Wed, 22 Sep 2021 14:50:33 +0000 (16:50 +0200)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoBump tmpl from 1.0.4 to 1.0.5 (#16762)
dependabot[bot] [Tue, 21 Sep 2021 04:36:35 +0000 (13:36 +0900)]
Bump tmpl from 1.0.4 to 1.0.5 (#16762)

Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/daaku/nodejs-tmpl/releases)
- [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5)

---
updated-dependencies:
- dependency-name: tmpl
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agohelm: set default SMTP_CA_FILE (#16750)
Alexandra Catalina [Mon, 20 Sep 2021 00:23:44 +0000 (17:23 -0700)]
helm: set default SMTP_CA_FILE (#16750)

https://github.com/mastodon/mastodon/pull/10857

4 years agoMerge pull request #1604 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Sun, 19 Sep 2021 12:10:26 +0000 (14:10 +0200)]
Merge pull request #1604 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Sun, 19 Sep 2021 11:07:27 +0000 (13:07 +0200)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoBump babel-jest from 27.1.0 to 27.2.0 (#16738)
dependabot[bot] [Sun, 19 Sep 2021 10:07:07 +0000 (19:07 +0900)]
Bump babel-jest from 27.1.0 to 27.2.0 (#16738)

Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 27.1.0 to 27.2.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v27.2.0/packages/babel-jest)

---
updated-dependencies:
- dependency-name: babel-jest
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump oj from 3.13.4 to 3.13.7 (#16751)
dependabot[bot] [Sun, 19 Sep 2021 09:14:36 +0000 (18:14 +0900)]
Bump oj from 3.13.4 to 3.13.7 (#16751)

Bumps [oj](https://github.com/ohler55/oj) from 3.13.4 to 3.13.7.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.13.4...v3.13.7)

---
updated-dependencies:
- dependency-name: oj
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump bundler-audit from 0.8.0 to 0.9.0.1 (#16701)
dependabot[bot] [Sun, 19 Sep 2021 05:44:27 +0000 (14:44 +0900)]
Bump bundler-audit from 0.8.0 to 0.9.0.1 (#16701)

Bumps [bundler-audit](https://github.com/postmodern/bundler-audit) from 0.8.0 to 0.9.0.1.
- [Release notes](https://github.com/postmodern/bundler-audit/releases)
- [Changelog](https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md)
- [Commits](https://github.com/postmodern/bundler-audit/compare/v0.8.0...v0.9.0.1)

---
updated-dependencies:
- dependency-name: bundler-audit
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump @testing-library/react from 12.0.0 to 12.1.0 (#16741)
dependabot[bot] [Sun, 19 Sep 2021 05:43:56 +0000 (14:43 +0900)]
Bump @testing-library/react from 12.0.0 to 12.1.0 (#16741)

Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 12.0.0 to 12.1.0.
- [Release notes](https://github.com/testing-library/react-testing-library/releases)
- [Changelog](https://github.com/testing-library/react-testing-library/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testing-library/react-testing-library/compare/v12.0.0...v12.1.0)

---
updated-dependencies:
- dependency-name: "@testing-library/react"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump sass from 1.39.0 to 1.39.2 (#16740)
dependabot[bot] [Sun, 19 Sep 2021 05:43:39 +0000 (14:43 +0900)]
Bump sass from 1.39.0 to 1.39.2 (#16740)

Bumps [sass](https://github.com/sass/dart-sass) from 1.39.0 to 1.39.2.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.39.0...1.39.2)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump ws from 8.2.1 to 8.2.2 (#16739)
dependabot[bot] [Sun, 19 Sep 2021 05:43:29 +0000 (14:43 +0900)]
Bump ws from 8.2.1 to 8.2.2 (#16739)

Bumps [ws](https://github.com/websockets/ws) from 8.2.1 to 8.2.2.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/8.2.1...8.2.2)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump jest from 27.1.0 to 27.2.0 (#16737)
dependabot[bot] [Sun, 19 Sep 2021 05:43:15 +0000 (14:43 +0900)]
Bump jest from 27.1.0 to 27.2.0 (#16737)

Bumps [jest](https://github.com/facebook/jest) from 27.1.0 to 27.2.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v27.1.0...v27.2.0)

---
updated-dependencies:
- dependency-name: jest
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump parallel from 1.20.1 to 1.21.0 (#16736)
dependabot[bot] [Sun, 19 Sep 2021 05:43:03 +0000 (14:43 +0900)]
Bump parallel from 1.20.1 to 1.21.0 (#16736)

Bumps [parallel](https://github.com/grosser/parallel) from 1.20.1 to 1.21.0.
- [Release notes](https://github.com/grosser/parallel/releases)
- [Commits](https://github.com/grosser/parallel/compare/v1.20.1...v1.21.0)

---
updated-dependencies:
- dependency-name: parallel
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump @babel/preset-env from 7.15.4 to 7.15.6 (#16742)
dependabot[bot] [Sun, 19 Sep 2021 05:42:48 +0000 (14:42 +0900)]
Bump @babel/preset-env from 7.15.4 to 7.15.6 (#16742)

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.15.4 to 7.15.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.15.6/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump bootsnap from 1.6.0 to 1.8.1 (#16677)
dependabot[bot] [Sun, 19 Sep 2021 05:42:32 +0000 (14:42 +0900)]
Bump bootsnap from 1.6.0 to 1.8.1 (#16677)

* Bump bootsnap from 1.6.0 to 1.8.1

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.6.0 to 1.8.1.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.6.0...v1.8.1)

---
updated-dependencies:
- dependency-name: bootsnap
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
* Remove deprecated bootsnap config options

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
4 years agoFix followers synchronization mechanism not working when URI has empty path (#16744)
Claire [Wed, 15 Sep 2021 16:51:16 +0000 (18:51 +0200)]
Fix followers synchronization mechanism not working when URI has empty path (#16744)

Follow-up to #16510, forgot the controller exposing the actual followers…

4 years agoMerge pull request #1602 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Tue, 14 Sep 2021 20:48:26 +0000 (22:48 +0200)]
Merge pull request #1602 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoBump rubocop-rails from 2.11.3 to 2.12.2 (#16734)
dependabot[bot] [Tue, 14 Sep 2021 12:14:25 +0000 (21:14 +0900)]
Bump rubocop-rails from 2.11.3 to 2.12.2 (#16734)

Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.11.3 to 2.12.2.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.11.3...v2.12.2)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Tue, 14 Sep 2021 11:50:30 +0000 (13:50 +0200)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoBump rubocop from 1.20.0 to 1.21.0 (#16733)
dependabot[bot] [Tue, 14 Sep 2021 08:52:53 +0000 (17:52 +0900)]
Bump rubocop from 1.20.0 to 1.21.0 (#16733)

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.20.0 to 1.21.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.20.0...v1.21.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump http from 5.0.1 to 5.0.2 (#16732)
dependabot[bot] [Tue, 14 Sep 2021 08:52:19 +0000 (17:52 +0900)]
Bump http from 5.0.1 to 5.0.2 (#16732)

Bumps [http](https://github.com/httprb/http) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/httprb/http/releases)
- [Changelog](https://github.com/httprb/http/blob/main/CHANGES.md)
- [Commits](https://github.com/httprb/http/compare/v5.0.1...v5.0.2)

---
updated-dependencies:
- dependency-name: http
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoUpdate Dockerfile (#16696)
Shlee [Mon, 13 Sep 2021 17:03:14 +0000 (01:03 +0800)]
Update Dockerfile (#16696)

4 years agoFix some Rails frameworks being unnecessarily loaded (#16725)
Claire [Mon, 13 Sep 2021 16:59:56 +0000 (18:59 +0200)]
Fix some Rails frameworks being unnecessarily loaded (#16725)

Saves about 10MiB of memory usage at boot

4 years agoStop setting a shortcode to newly-created media attachments (#16730)
Claire [Mon, 13 Sep 2021 16:59:37 +0000 (18:59 +0200)]
Stop setting a shortcode to newly-created media attachments (#16730)

* Stop setting a shortcode to newly-created media attachments

The WebUI has stopped using the “short media URL” in ages. This isn't used
anywhere except for mail notifications.

Deprecating it would allow us to eventually get rid of at least a database
column and corruption-prone index, as well as a controller.

* Fix tests

4 years agoBump ruby-saml from 1.11.0 to 1.13.0 (#16723)
Claire [Fri, 10 Sep 2021 13:43:28 +0000 (15:43 +0200)]
Bump ruby-saml from 1.11.0 to 1.13.0 (#16723)

Fixes #16720

4 years agoBump @babel/plugin-proposal-decorators from 7.14.5 to 7.15.4 (#16711)
dependabot[bot] [Fri, 10 Sep 2021 00:24:55 +0000 (09:24 +0900)]
Bump @babel/plugin-proposal-decorators from 7.14.5 to 7.15.4 (#16711)

Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators) from 7.14.5 to 7.15.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.15.4/packages/babel-plugin-proposal-decorators)

---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-decorators"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump @babel/preset-env from 7.15.0 to 7.15.4 (#16706)
dependabot[bot] [Fri, 10 Sep 2021 00:24:39 +0000 (09:24 +0900)]
Bump @babel/preset-env from 7.15.0 to 7.15.4 (#16706)

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.15.0 to 7.15.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.15.4/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoFix media icons not being added in CWs
Claire [Thu, 9 Sep 2021 14:51:14 +0000 (16:51 +0200)]
Fix media icons not being added in CWs

4 years agoBump devise-two-factor from 4.0.0 to 4.0.1 (#16705)
dependabot[bot] [Thu, 9 Sep 2021 08:43:00 +0000 (17:43 +0900)]
Bump devise-two-factor from 4.0.0 to 4.0.1 (#16705)

Bumps [devise-two-factor](https://github.com/tinfoil/devise-two-factor) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/tinfoil/devise-two-factor/releases)
- [Changelog](https://github.com/tinfoil/devise-two-factor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/tinfoil/devise-two-factor/compare/v4.0.0...v4.0.1)

---
updated-dependencies:
- dependency-name: devise-two-factor
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump sass from 1.38.2 to 1.39.0 (#16707)
dependabot[bot] [Thu, 9 Sep 2021 08:42:38 +0000 (17:42 +0900)]
Bump sass from 1.38.2 to 1.39.0 (#16707)

Bumps [sass](https://github.com/sass/dart-sass) from 1.38.2 to 1.39.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.38.2...1.39.0)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump axios from 0.21.1 to 0.21.4 (#16709)
dependabot[bot] [Thu, 9 Sep 2021 08:41:47 +0000 (17:41 +0900)]
Bump axios from 0.21.1 to 0.21.4 (#16709)

Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.4.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.4)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump @babel/runtime from 7.15.3 to 7.15.4 (#16710)
dependabot[bot] [Thu, 9 Sep 2021 08:41:26 +0000 (17:41 +0900)]
Bump @babel/runtime from 7.15.3 to 7.15.4 (#16710)

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.15.3 to 7.15.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.15.4/packages/babel-runtime)

---
updated-dependencies:
- dependency-name: "@babel/runtime"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump react-redux from 7.2.4 to 7.2.5 (#16708)
dependabot[bot] [Thu, 9 Sep 2021 08:41:03 +0000 (17:41 +0900)]
Bump react-redux from 7.2.4 to 7.2.5 (#16708)

Bumps [react-redux](https://github.com/reduxjs/react-redux) from 7.2.4 to 7.2.5.
- [Release notes](https://github.com/reduxjs/react-redux/releases)
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/react-redux/compare/v7.2.4...v7.2.5)

---
updated-dependencies:
- dependency-name: react-redux
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump npmlog from 5.0.0 to 5.0.1 (#16704)
dependabot[bot] [Thu, 9 Sep 2021 08:40:14 +0000 (17:40 +0900)]
Bump npmlog from 5.0.0 to 5.0.1 (#16704)

Bumps [npmlog](https://github.com/npm/npmlog) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/npm/npmlog/releases)
- [Changelog](https://github.com/npm/npmlog/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/npmlog/compare/v5.0.0...v5.0.1)

---
updated-dependencies:
- dependency-name: npmlog
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump oj from 3.13.2 to 3.13.4 (#16703)
dependabot[bot] [Thu, 9 Sep 2021 08:39:49 +0000 (17:39 +0900)]
Bump oj from 3.13.2 to 3.13.4 (#16703)

Bumps [oj](https://github.com/ohler55/oj) from 3.13.2 to 3.13.4.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.13.2...v3.13.4)

---
updated-dependencies:
- dependency-name: oj
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump aws-sdk-s3 from 1.100.0 to 1.102.0 (#16702)
dependabot[bot] [Thu, 9 Sep 2021 08:39:21 +0000 (17:39 +0900)]
Bump aws-sdk-s3 from 1.100.0 to 1.102.0 (#16702)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.100.0 to 1.102.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump @babel/core from 7.15.0 to 7.15.5 (#16712)
dependabot[bot] [Thu, 9 Sep 2021 08:36:14 +0000 (17:36 +0900)]
Bump @babel/core from 7.15.0 to 7.15.5 (#16712)

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.15.0 to 7.15.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.15.5/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agouse relative path for `scope` (#16714)
Holger [Wed, 8 Sep 2021 21:33:36 +0000 (05:33 +0800)]
use relative path for `scope` (#16714)

Use relative path for `scope` in web manifest to allow users use PWA correctly via alternate domains.

4 years agoFix addressing of remote groups' followers (#16700)
Claire [Wed, 8 Sep 2021 21:33:23 +0000 (23:33 +0200)]
Fix addressing of remote groups' followers (#16700)

Fixes #16699

4 years agoFix glitch-soc front-end not linking to the provided SOURCE_URL
Claire [Wed, 8 Sep 2021 11:47:48 +0000 (13:47 +0200)]
Fix glitch-soc front-end not linking to the provided SOURCE_URL

4 years agoFix media attachments not being displayed on polls
Claire [Wed, 8 Sep 2021 12:39:14 +0000 (14:39 +0200)]
Fix media attachments not being displayed on polls

Fixes #1595

4 years agoMerge pull request #1597 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Wed, 8 Sep 2021 12:16:17 +0000 (14:16 +0200)]
Merge pull request #1597 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Wed, 8 Sep 2021 11:27:37 +0000 (13:27 +0200)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoMerge pull request #1594 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Wed, 8 Sep 2021 11:24:54 +0000 (13:24 +0200)]
Merge pull request #1594 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoFix suspicious sign-in mail text being out of date (#16690)
Claire [Sat, 4 Sep 2021 14:44:50 +0000 (16:44 +0200)]
Fix suspicious sign-in mail text being out of date (#16690)

Fixes #16687

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Thu, 2 Sep 2021 08:52:09 +0000 (10:52 +0200)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoFix processing mentions to domains with non-ascii TLDs (#16689)
Claire [Wed, 1 Sep 2021 20:06:40 +0000 (22:06 +0200)]
Fix processing mentions to domains with non-ascii TLDs (#16689)

Fixes #16602

4 years agoBump eslint-plugin-react from 7.24.0 to 7.25.1 (#16680)
dependabot[bot] [Tue, 31 Aug 2021 23:18:55 +0000 (08:18 +0900)]
Bump eslint-plugin-react from 7.24.0 to 7.25.1 (#16680)

Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.24.0 to 7.25.1.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.24.0...v7.25.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-react
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump tar from 6.1.3 to 6.1.11 (#16685)
dependabot[bot] [Tue, 31 Aug 2021 23:18:29 +0000 (08:18 +0900)]
Bump tar from 6.1.3 to 6.1.11 (#16685)

Bumps [tar](https://github.com/npm/node-tar) from 6.1.3 to 6.1.11.
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v6.1.3...v6.1.11)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump rqrcode from 2.0.0 to 2.1.0 (#16678)
dependabot[bot] [Tue, 31 Aug 2021 11:58:34 +0000 (20:58 +0900)]
Bump rqrcode from 2.0.0 to 2.1.0 (#16678)

Bumps [rqrcode](https://github.com/whomwah/rqrcode) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/whomwah/rqrcode/releases)
- [Changelog](https://github.com/whomwah/rqrcode/blob/master/CHANGELOG.md)
- [Commits](https://github.com/whomwah/rqrcode/compare/v2.0.0...v2.1.0)

---
updated-dependencies:
- dependency-name: rqrcode
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump rubocop from 1.19.1 to 1.20.0 (#16674)
dependabot[bot] [Tue, 31 Aug 2021 11:56:14 +0000 (20:56 +0900)]
Bump rubocop from 1.19.1 to 1.20.0 (#16674)

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.19.1 to 1.20.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.19.1...v1.20.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump nokogiri from 1.12.3 to 1.12.4 (#16675)
dependabot[bot] [Tue, 31 Aug 2021 11:56:07 +0000 (20:56 +0900)]
Bump nokogiri from 1.12.3 to 1.12.4 (#16675)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.12.3 to 1.12.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.12.3...v1.12.4)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump aws-sdk-s3 from 1.99.0 to 1.100.0 (#16676)
dependabot[bot] [Tue, 31 Aug 2021 11:56:01 +0000 (20:56 +0900)]
Bump aws-sdk-s3 from 1.99.0 to 1.100.0 (#16676)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.99.0 to 1.100.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump ws from 8.2.0 to 8.2.1 (#16679)
dependabot[bot] [Tue, 31 Aug 2021 11:55:49 +0000 (20:55 +0900)]
Bump ws from 8.2.0 to 8.2.1 (#16679)

Bumps [ws](https://github.com/websockets/ws) from 8.2.0 to 8.2.1.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/8.2.0...8.2.1)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump sass from 1.38.0 to 1.38.2 (#16671)
dependabot[bot] [Sun, 29 Aug 2021 00:00:57 +0000 (09:00 +0900)]
Bump sass from 1.38.0 to 1.38.2 (#16671)

Bumps [sass](https://github.com/sass/dart-sass) from 1.38.0 to 1.38.2.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.38.0...1.38.2)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump eslint-plugin-import from 2.24.1 to 2.24.2 (#16668)
dependabot[bot] [Sun, 29 Aug 2021 00:00:41 +0000 (09:00 +0900)]
Bump eslint-plugin-import from 2.24.1 to 2.24.2 (#16668)

Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.24.1 to 2.24.2.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.24.1...v2.24.2)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>