]> cat aescling's git repositories - mastodon.git/log
mastodon.git
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>
4 years agoBump url-parse from 1.5.1 to 1.5.3 (#16666)
dependabot[bot] [Sat, 28 Aug 2021 16:18:58 +0000 (18:18 +0200)]
Bump url-parse from 1.5.1 to 1.5.3 (#16666)

Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.1 to 1.5.3.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.1...1.5.3)

---
updated-dependencies:
- dependency-name: url-parse
  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 color-string from 1.5.3 to 1.6.0 (#16665)
dependabot[bot] [Sat, 28 Aug 2021 16:18:35 +0000 (18:18 +0200)]
Bump color-string from 1.5.3 to 1.6.0 (#16665)

Bumps [color-string](https://github.com/Qix-/color-string) from 1.5.3 to 1.6.0.
- [Release notes](https://github.com/Qix-/color-string/releases)
- [Changelog](https://github.com/Qix-/color-string/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Qix-/color-string/commits/1.6.0)

---
updated-dependencies:
- dependency-name: color-string
  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 http from 4.4.1 to 5.0.1 (#16438)
dependabot[bot] [Sat, 28 Aug 2021 16:17:59 +0000 (18:17 +0200)]
Bump http from 4.4.1 to 5.0.1 (#16438)

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

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump y18n from 4.0.0 to 4.0.3 (#16664)
dependabot[bot] [Sat, 28 Aug 2021 16:15:05 +0000 (18:15 +0200)]
Bump y18n from 4.0.0 to 4.0.3 (#16664)

Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.3.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/y18n-v4.0.3/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/compare/v4.0.0...y18n-v4.0.3)

---
updated-dependencies:
- dependency-name: y18n
  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 jest from 26.6.3 to 27.1.0 (#16376)
dependabot[bot] [Sat, 28 Aug 2021 00:58:04 +0000 (09:58 +0900)]
Bump jest from 26.6.3 to 27.1.0 (#16376)

* Bump jest from 26.6.3 to 27.0.4

Bumps [jest](https://github.com/facebook/jest) from 26.6.3 to 27.0.4.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v26.6.3...v27.0.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
* Set test environment for jest

* Remove unnecessary ext

* Bump jest from 27.0.4 to 27.1.0

* Remove --coverage option

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
4 years agoBump sidekiq from 6.2.1 to 6.2.2 (#16647)
dependabot[bot] [Fri, 27 Aug 2021 23:59:45 +0000 (08:59 +0900)]
Bump sidekiq from 6.2.1 to 6.2.2 (#16647)

Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v6.2.1...v6.2.2)

---
updated-dependencies:
- dependency-name: sidekiq
  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 agoMerge pull request #1591 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Fri, 27 Aug 2021 13:28:00 +0000 (15:28 +0200)]
Merge pull request #1591 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoBump webpacker from 5.4.0 to 5.4.2 (#16648)
dependabot[bot] [Fri, 27 Aug 2021 12:47:43 +0000 (21:47 +0900)]
Bump webpacker from 5.4.0 to 5.4.2 (#16648)

Bumps [webpacker](https://github.com/rails/webpacker) from 5.4.0 to 5.4.2.
- [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.0...v5.4.2)

---
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 faker from 2.18.0 to 2.19.0 (#16646)
dependabot[bot] [Fri, 27 Aug 2021 12:47:00 +0000 (21:47 +0900)]
Bump faker from 2.18.0 to 2.19.0 (#16646)

Bumps [faker](https://github.com/faker-ruby/faker) from 2.18.0 to 2.19.0.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v2.18.0...v2.19.0)

---
updated-dependencies:
- dependency-name: faker
  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 rubocop from 1.19.0 to 1.19.1 (#16649)
dependabot[bot] [Fri, 27 Aug 2021 12:46:28 +0000 (21:46 +0900)]
Bump rubocop from 1.19.0 to 1.19.1 (#16649)

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.19.0 to 1.19.1.
- [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.0...v1.19.1)

---
updated-dependencies:
- dependency-name: rubocop
  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 ago[Glitch] Fix follow request count to dynamically update
matildepark [Wed, 25 Aug 2021 15:46:29 +0000 (11:46 -0400)]
[Glitch] Fix follow request count to dynamically update

Port 79341d0f5f3eb2d90f5ea954f4037120f7189cec to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Fri, 27 Aug 2021 09:29:03 +0000 (11:29 +0200)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoExplicitly set userVerification to discoraged (#16545)
Truong Nguyen [Thu, 26 Aug 2021 14:51:22 +0000 (23:51 +0900)]
Explicitly set userVerification to discoraged (#16545)

4 years agoFix authentication failures after going halfway through a sign-in attempt (#16607)
Claire [Wed, 25 Aug 2021 20:52:41 +0000 (22:52 +0200)]
Fix authentication failures after going halfway through a sign-in attempt (#16607)

* Add tests

* Add security-related tests

My first (unpublished) attempt at fixing the issues introduced (extremely
hard-to-exploit) security vulnerabilities, addressing them in a test.

* Fix authentication failures after going halfway through a sign-in attempt

* Refactor `authenticate_with_sign_in_token` and `authenticate_with_two_factor` to make the two authentication steps more obvious

4 years agoNew env variable: CAS_SECURITY_ASSUME_EMAIL_IS_VERIFIED (#16655)
Daniel [Wed, 25 Aug 2021 16:41:24 +0000 (16:41 +0000)]
New env variable: CAS_SECURITY_ASSUME_EMAIL_IS_VERIFIED (#16655)

When using a CAS server, the users only have a temporary email
`change@me-foo-cas.com` which can't be changed but by an
administrator.

We need a new environment variable like for SAML to assume the email
from CAS is verified.

* config/initializers/omniauth.rb: define CAS option for assuming
  email are always verified.
* .env.nanobox: add new variable as an example.

4 years agoBump rails from 6.1.4 to 6.1.4.1 (#16650)
dependabot[bot] [Wed, 25 Aug 2021 16:39:55 +0000 (01:39 +0900)]
Bump rails from 6.1.4 to 6.1.4.1 (#16650)

Bumps [rails](https://github.com/rails/rails) from 6.1.4 to 6.1.4.1.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v6.1.4...v6.1.4.1)

---
updated-dependencies:
- dependency-name: rails
  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 follow request count to dynamically update (#16652)
matildepark [Wed, 25 Aug 2021 15:46:29 +0000 (11:46 -0400)]
Fix follow request count to dynamically update (#16652)

4 years agoFix undefined variable for Auth::OmniauthCallbacksController (#16654)
Daniel [Wed, 25 Aug 2021 15:40:56 +0000 (15:40 +0000)]
Fix undefined variable for Auth::OmniauthCallbacksController (#16654)

The addition of authentication history broke the omniauth login with
the following error:

  method=GET path=/auth/auth/cas/callback format=html
  controller=Auth::OmniauthCallbacksController action=cas status=500
  error='NameError: undefined local variable or method `user' for
  #<Auth::OmniauthCallbacksController:0x00000000036290>
  Did you mean?  @user' duration=435.93 view=0.00 db=36.19

* app/controllers/auth/omniauth_callbacks_controller.rb: fix variable
  name to `@user`

4 years agoBump eslint-plugin-import from 2.24.0 to 2.24.1 (#16635)
dependabot[bot] [Mon, 23 Aug 2021 13:03:53 +0000 (22:03 +0900)]
Bump eslint-plugin-import from 2.24.0 to 2.24.1 (#16635)

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

---
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>
4 years agoBump ws from 8.1.0 to 8.2.0 (#16636)
dependabot[bot] [Mon, 23 Aug 2021 13:03:38 +0000 (22:03 +0900)]
Bump ws from 8.1.0 to 8.2.0 (#16636)

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

---
updated-dependencies:
- dependency-name: ws
  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/plugin-transform-runtime from 7.14.5 to 7.15.0 (#16590)
dependabot[bot] [Mon, 23 Aug 2021 13:03:23 +0000 (22:03 +0900)]
Bump @babel/plugin-transform-runtime from 7.14.5 to 7.15.0 (#16590)

Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.14.5 to 7.15.0.
- [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.0/packages/babel-plugin-transform-runtime)

---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-runtime"
  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 agoMerge pull request #1589 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Fri, 20 Aug 2021 14:30:21 +0000 (16:30 +0200)]
Merge pull request #1589 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Fri, 20 Aug 2021 14:14:45 +0000 (16:14 +0200)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoFix “discoverable” account setting being tied to profile directory (#16637)
Claire [Fri, 20 Aug 2021 14:11:58 +0000 (16:11 +0200)]
Fix “discoverable” account setting being tied to profile directory (#16637)

4 years agoMerge pull request #1588 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Fri, 20 Aug 2021 12:26:14 +0000 (14:26 +0200)]
Merge pull request #1588 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years ago[Glitch] Fix crash if a notification contains an unprocessed media attachment
Claire [Wed, 11 Aug 2021 15:49:10 +0000 (17:49 +0200)]
[Glitch] Fix crash if a notification contains an unprocessed media attachment

Port 0c24c865b785a557f43125c976090e271247a2b1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years ago[Glitch] Fix download button color in audio player
Claire [Wed, 11 Aug 2021 15:48:55 +0000 (17:48 +0200)]
[Glitch] Fix download button color in audio player

Port aaf24d3093d565461b0051d2238d8b74db63a041 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Fri, 20 Aug 2021 11:01:50 +0000 (13:01 +0200)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoMake sure nginx always send HSTS header (#16633)
Peter Dave Hello [Fri, 20 Aug 2021 09:54:11 +0000 (17:54 +0800)]
Make sure nginx always send HSTS header (#16633)

By default, it'll only send those headers when the response code is one of the following:
- 200, 201, 204, 206, 301, 302, 303, 304, 307 & 308

As all the traffics should be https, the http protocol only exists to do 301 redirect,
and always send the HSTS header is almost one of the best practices, we should set
nginx to do so.

Reference:
- https://nginx.org/en/docs/http/ngx_http_headers_module.html#add_header
- https://ssl-config.mozilla.org/

4 years agoAdd tests for SuspendAccountService and UnsuspendAccountService (#16627)
Claire [Fri, 20 Aug 2021 09:53:33 +0000 (11:53 +0200)]
Add tests for SuspendAccountService and UnsuspendAccountService (#16627)

* Add tests for SuspendAccountService

* Add tests for UnsuspendAccountService

4 years agoBump rspec-rails from 5.0.1 to 5.0.2 (#16622)
dependabot[bot] [Fri, 20 Aug 2021 09:48:39 +0000 (18:48 +0900)]
Bump rspec-rails from 5.0.1 to 5.0.2 (#16622)

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

---
updated-dependencies:
- dependency-name: rspec-rails
  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 sass from 1.37.0 to 1.38.0 (#16623)
dependabot[bot] [Fri, 20 Aug 2021 09:48:25 +0000 (18:48 +0900)]
Bump sass from 1.37.0 to 1.38.0 (#16623)

Bumps [sass](https://github.com/sass/dart-sass) from 1.37.0 to 1.38.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.37.0...1.38.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 fast_blank from 1.0.0 to 1.0.1 (#16621)
dependabot[bot] [Fri, 20 Aug 2021 09:47:45 +0000 (18:47 +0900)]
Bump fast_blank from 1.0.0 to 1.0.1 (#16621)

Bumps [fast_blank](https://github.com/SamSaffron/fast_blank) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/SamSaffron/fast_blank/releases)
- [Commits](https://github.com/SamSaffron/fast_blank/compare/1.0.0...v1.0.1)

---
updated-dependencies:
- dependency-name: fast_blank
  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 agoDisable nginx ssl_session_tickets for better security (#16632)
Peter Dave Hello [Fri, 20 Aug 2021 07:15:07 +0000 (15:15 +0800)]
Disable nginx ssl_session_tickets for better security (#16632)

It's default turned on, but it's better to turn it off for security reason.

Reference:
- https://nginx.org/en/docs/http/ngx_http_ssl_module.html#ssl_session_tickets
- https://github.com/mozilla/server-side-tls/issues/135

4 years agoFix remotely-suspended accounts' toots being merged back into timelines (#16628)
Claire [Fri, 20 Aug 2021 06:40:33 +0000 (08:40 +0200)]
Fix remotely-suspended accounts' toots being merged back into timelines (#16628)

* Fix remotely-suspended accounts' toots being merged back into timelines

* Mark remotely-deleted accounts as remotely suspended

4 years agoFix #16603 (#16605)
Holger [Fri, 20 Aug 2021 06:39:37 +0000 (14:39 +0800)]
Fix #16603 (#16605)

Fix issue #16603 undefined method `serialize_payload' for Unsuspend Account Service error.
It seems that this service forgot to `include Payloadable` so that `serialize_payload` could not be found in this service.

4 years agoBump oj from 3.12.2 to 3.13.2 (#16620)
dependabot[bot] [Tue, 17 Aug 2021 04:58:07 +0000 (13:58 +0900)]
Bump oj from 3.12.2 to 3.13.2 (#16620)

Bumps [oj](https://github.com/ohler55/oj) from 3.12.2 to 3.13.2.
- [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.12.2...v3.13.2)

---
updated-dependencies:
- dependency-name: oj
  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-import from 2.23.4 to 2.24.0 (#16592)
dependabot[bot] [Tue, 17 Aug 2021 04:20:21 +0000 (13:20 +0900)]
Bump eslint-plugin-import from 2.23.4 to 2.24.0 (#16592)

Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.23.4 to 2.24.0.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.23.4...v2.24.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  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 yargs from 17.0.1 to 17.1.1 (#16614)
dependabot[bot] [Tue, 17 Aug 2021 04:19:51 +0000 (13:19 +0900)]
Bump yargs from 17.0.1 to 17.1.1 (#16614)

Bumps [yargs](https://github.com/yargs/yargs) from 17.0.1 to 17.1.1.
- [Release notes](https://github.com/yargs/yargs/releases)
- [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/yargs/compare/v17.0.1...v17.1.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 agoBump ws from 8.0.0 to 8.1.0 (#16616)
dependabot[bot] [Tue, 17 Aug 2021 04:19:31 +0000 (13:19 +0900)]
Bump ws from 8.0.0 to 8.1.0 (#16616)

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

---
updated-dependencies:
- dependency-name: ws
  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 bullet from 6.1.4 to 6.1.5 (#16617)
dependabot[bot] [Tue, 17 Aug 2021 04:01:31 +0000 (13:01 +0900)]
Bump bullet from 6.1.4 to 6.1.5 (#16617)

Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.1.4 to 6.1.5.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/6.1.4...6.1.5)

---
updated-dependencies:
- dependency-name: bullet
  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 fastimage from 2.2.4 to 2.2.5 (#16609)
dependabot[bot] [Tue, 17 Aug 2021 04:00:53 +0000 (13:00 +0900)]
Bump fastimage from 2.2.4 to 2.2.5 (#16609)

Bumps [fastimage](https://github.com/sdsykes/fastimage) from 2.2.4 to 2.2.5.
- [Release notes](https://github.com/sdsykes/fastimage/releases)
- [Changelog](https://github.com/sdsykes/fastimage/blob/master/CHANGELOG)
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.2.4...v2.2.5)

---
updated-dependencies:
- dependency-name: fastimage
  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.2 to 1.12.3 (#16610)
dependabot[bot] [Tue, 17 Aug 2021 04:00:37 +0000 (13:00 +0900)]
Bump nokogiri from 1.12.2 to 1.12.3 (#16610)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.12.2 to 1.12.3.
- [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.2...v1.12.3)

---
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 blurhash from 1.1.3 to 1.1.4 (#16613)
dependabot[bot] [Tue, 17 Aug 2021 04:00:17 +0000 (13:00 +0900)]
Bump blurhash from 1.1.3 to 1.1.4 (#16613)

Bumps [blurhash](https://github.com/woltapp/blurhash) from 1.1.3 to 1.1.4.
- [Release notes](https://github.com/woltapp/blurhash/releases)
- [Commits](https://github.com/woltapp/blurhash/commits)

---
updated-dependencies:
- dependency-name: blurhash
  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 pundit from 2.1.0 to 2.1.1 (#16615)
dependabot[bot] [Tue, 17 Aug 2021 04:00:04 +0000 (13:00 +0900)]
Bump pundit from 2.1.0 to 2.1.1 (#16615)

Bumps [pundit](https://github.com/varvet/pundit) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/varvet/pundit/releases)
- [Changelog](https://github.com/varvet/pundit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/varvet/pundit/compare/v2.1.0...v2.1.1)

---
updated-dependencies:
- dependency-name: pundit
  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 path-parse from 1.0.6 to 1.0.7 (#16597)
dependabot[bot] [Tue, 17 Aug 2021 03:58:37 +0000 (12:58 +0900)]
Bump path-parse from 1.0.6 to 1.0.7 (#16597)

Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  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 parallel_tests from 3.7.0 to 3.7.1 (#16612)
dependabot[bot] [Tue, 17 Aug 2021 03:49:59 +0000 (12:49 +0900)]
Bump parallel_tests from 3.7.0 to 3.7.1 (#16612)

Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 3.7.0 to 3.7.1.
- [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.0...v3.7.1)

---
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 aws-sdk-s3 from 1.98.0 to 1.99.0 (#16611)
dependabot[bot] [Tue, 17 Aug 2021 03:49:21 +0000 (12:49 +0900)]
Bump aws-sdk-s3 from 1.98.0 to 1.99.0 (#16611)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.98.0 to 1.99.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 webmock from 3.13.0 to 3.14.0 (#16587)
dependabot[bot] [Tue, 17 Aug 2021 03:49:00 +0000 (12:49 +0900)]
Bump webmock from 3.13.0 to 3.14.0 (#16587)

Bumps [webmock](https://github.com/bblimke/webmock) from 3.13.0 to 3.14.0.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.13.0...v3.14.0)

---
updated-dependencies:
- dependency-name: webmock
  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 redux from 4.1.0 to 4.1.1 (#16586)
dependabot[bot] [Tue, 17 Aug 2021 03:41:01 +0000 (12:41 +0900)]
Bump redux from 4.1.0 to 4.1.1 (#16586)

Bumps [redux](https://github.com/reduxjs/redux) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/reduxjs/redux/releases)
- [Changelog](https://github.com/reduxjs/redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/redux/compare/v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: 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 rubocop from 1.18.4 to 1.19.0 (#16618)
dependabot[bot] [Tue, 17 Aug 2021 03:40:17 +0000 (12:40 +0900)]
Bump rubocop from 1.18.4 to 1.19.0 (#16618)

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.18.4 to 1.19.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.18.4...v1.19.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 strong_migrations from 0.7.7 to 0.7.8 (#16584)
dependabot[bot] [Tue, 17 Aug 2021 03:32:29 +0000 (12:32 +0900)]
Bump strong_migrations from 0.7.7 to 0.7.8 (#16584)

Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.7.7 to 0.7.8.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.7.7...v0.7.8)

---
updated-dependencies:
- dependency-name: strong_migrations
  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.14.8 to 7.15.3 (#16619)
dependabot[bot] [Tue, 17 Aug 2021 03:31:14 +0000 (12:31 +0900)]
Bump @babel/runtime from 7.14.8 to 7.15.3 (#16619)

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.14.8 to 7.15.3.
- [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.3/packages/babel-runtime)

---
updated-dependencies:
- dependency-name: "@babel/runtime"
  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.14.8 to 7.15.0 (#16588)
dependabot[bot] [Tue, 17 Aug 2021 03:30:54 +0000 (12:30 +0900)]
Bump @babel/core from 7.14.8 to 7.15.0 (#16588)

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.14.8 to 7.15.0.
- [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.0/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  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 @testing-library/react from 11.2.7 to 12.0.0 (#16440)
dependabot[bot] [Tue, 17 Aug 2021 03:30:15 +0000 (12:30 +0900)]
Bump @testing-library/react from 11.2.7 to 12.0.0 (#16440)

Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 11.2.7 to 12.0.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/v11.2.7...v12.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoFix crash if a notification contains an unprocessed media attachment (#16573)
Claire [Wed, 11 Aug 2021 15:49:10 +0000 (17:49 +0200)]
Fix crash if a notification contains an unprocessed media attachment (#16573)

* Refactor AttachmentList

* Do not crash if a notification contains an unprocessed media attachment

Fixes #16530

* Fix spacing in compact form

4 years agoFix download button color in audio player (#16572)
Claire [Wed, 11 Aug 2021 15:48:55 +0000 (17:48 +0200)]
Fix download button color in audio player (#16572)

Fixes #16571

4 years agoFix followers synchronization mechanism not working when URI has empty path (#16510)
Claire [Wed, 11 Aug 2021 15:48:42 +0000 (17:48 +0200)]
Fix followers synchronization mechanism not working when URI has empty path (#16510)

* Fix followers synchronization mechanism not working when URI has empty path

To my knowledge, there is no current implementation on the fediverse
that can use bare domains (e.g., actor is at https://example.org instead of
something like https://example.org/actor) that also plans to support the
followers synchronization mechanism. However, Mastodon's current implementation
would exclude such accounts from followers list.

Also adds tests and rename them to reflect the proper method names.

* Move url prefix regexp to its own constant

4 years agoMerge pull request #1585 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Wed, 11 Aug 2021 15:25:06 +0000 (17:25 +0200)]
Merge pull request #1585 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Wed, 11 Aug 2021 14:41:59 +0000 (16:41 +0200)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoFix crash when encountering invalid account fields (#16598)
Claire [Wed, 11 Aug 2021 14:40:55 +0000 (16:40 +0200)]
Fix crash when encountering invalid account fields (#16598)

* Add test

* Fix crash when encountering invalid account fields

4 years agoNodeJS 14 support - circleci/docker/.nvmrc (#16163)
Shlee [Tue, 10 Aug 2021 20:56:13 +0000 (04:56 +0800)]
NodeJS 14 support - circleci/docker/.nvmrc (#16163)

* Update config.yml

* Update Dockerfile

* Update .nvmrc

* Update Dockerfile

* NodeJS 10 is EOL.

* Update package.json

* Update README.md

* Update Vagrantfile

* Update Dockerfile

* Update Dockerfile

4 years agoMerge pull request #1583 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Mon, 9 Aug 2021 22:25:33 +0000 (00:25 +0200)]
Merge pull request #1583 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years ago[Glitch] Fix logout link not working in safari
Takeshi Umeda [Fri, 6 Aug 2021 10:14:13 +0000 (19:14 +0900)]
[Glitch] Fix logout link not working in safari

Port b2875b1864d5bd72e6902ffc842d1be6818c210e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years ago[Glitch] Fix trends layout
Jeong Arm [Thu, 5 Aug 2021 11:05:32 +0000 (20:05 +0900)]
[Glitch] Fix trends layout

Port 6e0ab6814f4d3906c035e10a9cedbc41ae5967e9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoFix account statuses cleanup settings controller for glitch-soc's theming system
Claire [Mon, 9 Aug 2021 21:28:06 +0000 (23:28 +0200)]
Fix account statuses cleanup settings controller for glitch-soc's theming system

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Mon, 9 Aug 2021 21:25:49 +0000 (23:25 +0200)]
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `Gemfile.lock`:
  Not a real conflict, upstream-updated dependency (redis) textually too
  close to glitch-soc-only dependecy.
  Updated redis gem like upstream did.

4 years agoAdd feature to automatically delete old toots (#16529)
Claire [Mon, 9 Aug 2021 21:11:50 +0000 (23:11 +0200)]
Add feature to automatically delete old toots (#16529)

* Add account statuses cleanup policy model

* Record last inspected toot to delete to speed up successive calls to statuses_to_delete

* Add service to cleanup a given account's statuses within a budget

* Add worker to go through account policies and delete old toots

* Fix last inspected status id logic

All existing statuses older or equal to last inspected status id must be
kept by the current policy. This is an invariant that must be kept so that
resuming deletion from the last inspected status remains sound.

* Add tests

* Refactor scheduler and add tests

* Add user interface

* Add support for discriminating based on boosts/favs

* Add UI support for min_reblogs and min_favs, rework UI

* Address first round of review comments

* Replace Snowflake#id_at_start with with_random parameter

* Add tests

* Add tests for StatusesCleanupController

* Rework settings page

* Adjust load-avoiding mechanisms

* Please CodeClimate

4 years agoBump sanitize from 5.2.3 to 6.0.0 (#16580)
Claire [Mon, 9 Aug 2021 18:46:57 +0000 (20:46 +0200)]
Bump sanitize from 5.2.3 to 6.0.0 (#16580)

Fixes nokogumbo/nokogiri conflicts by dropping the nokogumbo gem, as it has
been merged in the nokogiri gem.

4 years agoFix invalid blurhash handling in Create activity (#16583)
Takeshi Umeda [Mon, 9 Aug 2021 11:33:19 +0000 (20:33 +0900)]
Fix invalid blurhash handling in Create activity (#16583)

4 years agoFix when MoveWorker cannot get locale from remote account (#16576)
Takeshi Umeda [Sun, 8 Aug 2021 13:31:02 +0000 (22:31 +0900)]
Fix when MoveWorker cannot get locale from remote account (#16576)

4 years agoFix owned account notes not being deleted when an account is deleted (#16579)
Claire [Sun, 8 Aug 2021 13:29:57 +0000 (15:29 +0200)]
Fix owned account notes not being deleted when an account is deleted (#16579)

* Add account_notes relationship

* Add tests

* Fix owned account notes not being deleted when an account is deleted

* Add post-migration to clean up orphaned account notes

4 years agoFix unsupported video error message handling (#16581)
Takeshi Umeda [Sun, 8 Aug 2021 13:28:57 +0000 (22:28 +0900)]
Fix unsupported video error message handling (#16581)

4 years agoBump @babel/preset-env from 7.14.8 to 7.15.0 (#16577)
dependabot[bot] [Sat, 7 Aug 2021 08:49:05 +0000 (17:49 +0900)]
Bump @babel/preset-env from 7.14.8 to 7.15.0 (#16577)

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.14.8 to 7.15.0.
- [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.0/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  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 sass from 1.36.0 to 1.37.0 (#16551)
dependabot[bot] [Sat, 7 Aug 2021 04:10:48 +0000 (13:10 +0900)]
Bump sass from 1.36.0 to 1.37.0 (#16551)

Bumps [sass](https://github.com/sass/dart-sass) from 1.36.0 to 1.37.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.36.0...1.37.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 aws-sdk-s3 from 1.96.2 to 1.98.0 (#16559)
dependabot[bot] [Sat, 7 Aug 2021 04:10:27 +0000 (13:10 +0900)]
Bump aws-sdk-s3 from 1.96.2 to 1.98.0 (#16559)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.96.2 to 1.98.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 nokogiri from 1.11.7 to 1.12.0 (#16560)
dependabot[bot] [Sat, 7 Aug 2021 04:01:59 +0000 (13:01 +0900)]
Bump nokogiri from 1.11.7 to 1.12.0 (#16560)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.7 to 1.12.0.
- [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.11.7...v1.12.0)

---
updated-dependencies:
- dependency-name: nokogiri
  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 puma from 5.3.2 to 5.4.0 (#16561)
dependabot[bot] [Sat, 7 Aug 2021 04:01:32 +0000 (13:01 +0900)]
Bump puma from 5.3.2 to 5.4.0 (#16561)

Bumps [puma](https://github.com/puma/puma) from 5.3.2 to 5.4.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.3.2...v5.4.0)

---
updated-dependencies:
- dependency-name: puma
  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 sidekiq-unique-jobs from 7.1.2 to 7.1.5 (#16563)
dependabot[bot] [Sat, 7 Aug 2021 04:01:06 +0000 (13:01 +0900)]
Bump sidekiq-unique-jobs from 7.1.2 to 7.1.5 (#16563)

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

---
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 redis from 4.3.1 to 4.4.0 (#16562)
dependabot[bot] [Sat, 7 Aug 2021 04:00:49 +0000 (13:00 +0900)]
Bump redis from 4.3.1 to 4.4.0 (#16562)

Bumps [redis](https://github.com/redis/redis-rb) from 4.3.1 to 4.4.0.
- [Release notes](https://github.com/redis/redis-rb/releases)
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/redis-rb/compare/v4.3.1...v4.4.0)

---
updated-dependencies:
- dependency-name: redis
  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 tar from 6.0.5 to 6.1.3 (#16566)
dependabot[bot] [Sat, 7 Aug 2021 03:59:54 +0000 (12:59 +0900)]
Bump tar from 6.0.5 to 6.1.3 (#16566)

Bumps [tar](https://github.com/npm/node-tar) from 6.0.5 to 6.1.3.
- [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.0.5...v6.1.3)

---
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 agoAdd missing Korean translations
Jeong Arm [Tue, 3 Aug 2021 14:04:03 +0000 (23:04 +0900)]
Add missing Korean translations

4 years agoFix typo on simple_form.ko.yml
Jeong Arm [Tue, 3 Aug 2021 12:10:29 +0000 (21:10 +0900)]
Fix typo on simple_form.ko.yml

4 years agoAdd Korean translations
Jeong Arm [Tue, 3 Aug 2021 09:53:02 +0000 (18:53 +0900)]
Add Korean translations