]> cat aescling's git repositories - mastodon.git/log
mastodon.git
4 years agoMerge pull request #33 from kibicat/merge_glich-soc_2021-12-20
kibigo! [Tue, 18 Jan 2022 00:06:02 +0000 (16:06 -0800)]
Merge pull request #33 from kibicat/merge_glich-soc_2021-12-20

4 years agoMerge remote-tracking branch 'origin' into merge_glich-soc_2021-12-20
single-right-quote [Tue, 21 Dec 2021 00:33:51 +0000 (00:33 +0000)]
Merge remote-tracking branch 'origin' into merge_glich-soc_2021-12-20

4 years agoMerge pull request #1650 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Sat, 18 Dec 2021 12:17:37 +0000 (13:17 +0100)]
Merge pull request #1650 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoRevert "Change workflow to push to Docker Hub (#16980)"
Claire [Sat, 18 Dec 2021 10:57:42 +0000 (11:57 +0100)]
Revert "Change workflow to push to Docker Hub (#16980)"

This reverts commit 4b616c4f0a2158883034cd756391bd70265b787d.

4 years ago[Glitch] Change title of retention chart
Claire [Fri, 17 Dec 2021 22:00:41 +0000 (23:00 +0100)]
[Glitch] Change title of retention chart

Port 0c17fd91091fd2f230224d5fce218688d480502c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Sat, 18 Dec 2021 10:44:54 +0000 (11:44 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoAdd ability for admins to delete canonical email blocks (#16644)
Claire [Fri, 17 Dec 2021 22:02:14 +0000 (23:02 +0100)]
Add ability for admins to delete canonical email blocks (#16644)

* Add admin option to remove canonical email blocks from a deleted account

* Add tootctl canonical_email_blocks to inspect and remove canonical email blocks

4 years agoAdd ability to purge undeliverable domains from admin interface (#16686)
Claire [Fri, 17 Dec 2021 22:01:21 +0000 (23:01 +0100)]
Add ability to purge undeliverable domains from admin interface (#16686)

* Add ability to purge undeliverable domains from admin interface

* Add tests

4 years agoChange title of retention chart (#16909)
Claire [Fri, 17 Dec 2021 22:00:41 +0000 (23:00 +0100)]
Change title of retention chart (#16909)

Changes from “Retention” to “User retention rate by month after sign-up”.
This should make it much clearer to people not familiar with retention charts
what it actually means.

4 years agoChange list title input styling (#17092)
Claire [Fri, 17 Dec 2021 22:00:05 +0000 (23:00 +0100)]
Change list title input styling (#17092)

4 years agoMerge pull request #1648 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Thu, 16 Dec 2021 18:45:17 +0000 (19:45 +0100)]
Merge pull request #1648 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years ago[Glitch] ignore hashtag suggestions if they vary only in case
David Sterry [Wed, 15 Dec 2021 22:47:19 +0000 (14:47 -0800)]
[Glitch] ignore hashtag suggestions if they vary only in case

Port 2aafa5b4e7a83ce8195cd739f1233a52ab060db7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years ago[Glitch] Show correct error message if chosen password is too long
Rens Groothuijsen [Sun, 5 Dec 2021 20:49:50 +0000 (21:49 +0100)]
[Glitch] Show correct error message if chosen password is too long

Port 66baa629ea1c3890d5c631099d41e6af14974d7e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years ago[Glitch] Add batch suspend for accounts in admin UI
Eugen Rochko [Sun, 5 Dec 2021 20:48:39 +0000 (21:48 +0100)]
[Glitch] Add batch suspend for accounts in admin UI

Port SCSS changes from 2aafa5b4e7a83ce8195cd739f1233a52ab060db7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Thu, 16 Dec 2021 15:19:28 +0000 (16:19 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/views/admin/pending_accounts/index.html.haml`:
  Removed upstream, while it had glitch-soc-specific changes to accomodate
  for glitch-soc's theming system.
  Removed the file.

Additional changes:
- `app/views/admin/accounts/index.html.haml':
  Accomodate for glitch-soc's theming system.

4 years agoignore hashtag suggestions if they vary only in case (#16460)
David Sterry [Wed, 15 Dec 2021 22:47:19 +0000 (14:47 -0800)]
ignore hashtag suggestions if they vary only in case (#16460)

* ignore hashtag suggestions if they vary only in case

* remove console.logs and unused args

* consistently add space when dismissing suggestions

* linting

4 years agoFix follow recommendation biased towards older accounts (#17126)
Takeshi Umeda [Mon, 13 Dec 2021 22:21:14 +0000 (07:21 +0900)]
Fix follow recommendation biased towards older accounts (#17126)

4 years agoFix incorrect singular version of some translation strings (#17124)
Claire [Mon, 13 Dec 2021 17:25:25 +0000 (18:25 +0100)]
Fix incorrect singular version of some translation strings (#17124)

Fixes #17120

Co-authored-by: Mélanie Chauvel <perso@hack-libre.org>
Co-authored-by: Mélanie Chauvel <perso@hack-libre.org>
4 years agoChange trending hashtags threshold back from 15 to 5 (#17122)
Eugen Rochko [Mon, 13 Dec 2021 04:32:29 +0000 (05:32 +0100)]
Change trending hashtags threshold back from 15 to 5 (#17122)

4 years agoAdd remove orphans to tootctl statuses remove (#17067)
Takeshi Umeda [Sun, 12 Dec 2021 05:09:14 +0000 (14:09 +0900)]
Add remove orphans to tootctl statuses remove (#17067)

* Add remove orphans to tootctl statuses remove

* Add REINDEX and change option from vacuum to compression-database

* Changed to extract the deletion target of conversations to a temporary table

* Support progress bar and exceptions when media remove

* Add continue option

* Fix compression to compress

* Remove skip_remove_orphans

4 years agoUpdate .dockerignore/.gitignore for #16947 etc (#17099)
Shlee [Mon, 6 Dec 2021 17:04:04 +0000 (04:04 +1100)]
Update .dockerignore/.gitignore for #16947 etc (#17099)

* Update .dockerignore

* Update .gitignore

4 years agoFix redirection when succeeded WebAuthn (#17098)
heguro [Sun, 5 Dec 2021 20:50:12 +0000 (05:50 +0900)]
Fix redirection when succeeded WebAuthn (#17098)

4 years agoShow correct error message if chosen password is too long (#17082)
Rens Groothuijsen [Sun, 5 Dec 2021 20:49:50 +0000 (21:49 +0100)]
Show correct error message if chosen password is too long (#17082)

* Add correct error message for exceeding max length on password confirmation field

* Code style fixes

4 years agoAdd batch suspend for accounts in admin UI (#17009)
Eugen Rochko [Sun, 5 Dec 2021 20:48:39 +0000 (21:48 +0100)]
Add batch suspend for accounts in admin UI (#17009)

4 years agoBump jest from 27.3.1 to 27.4.3 (#17094)
dependabot[bot] [Sat, 4 Dec 2021 14:53:39 +0000 (23:53 +0900)]
Bump jest from 27.3.1 to 27.4.3 (#17094)

Bumps [jest](https://github.com/facebook/jest) from 27.3.1 to 27.4.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.3.1...v27.4.3)

---
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 @testing-library/jest-dom from 5.15.1 to 5.16.0 (#17095)
dependabot[bot] [Sat, 4 Dec 2021 14:53:26 +0000 (23:53 +0900)]
Bump @testing-library/jest-dom from 5.15.1 to 5.16.0 (#17095)

Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.15.1 to 5.16.0.
- [Release notes](https://github.com/testing-library/jest-dom/releases)
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.15.1...v5.16.0)

---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
  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 reselect from 4.1.4 to 4.1.5 (#17075)
dependabot[bot] [Sat, 4 Dec 2021 14:41:40 +0000 (23:41 +0900)]
Bump reselect from 4.1.4 to 4.1.5 (#17075)

Bumps [reselect](https://github.com/reduxjs/reselect) from 4.1.4 to 4.1.5.
- [Release notes](https://github.com/reduxjs/reselect/releases)
- [Changelog](https://github.com/reduxjs/reselect/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/reselect/compare/v4.1.4...v4.1.5)

---
updated-dependencies:
- dependency-name: reselect
  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 redux-thunk from 2.4.0 to 2.4.1 (#17074)
dependabot[bot] [Sat, 4 Dec 2021 14:41:12 +0000 (23:41 +0900)]
Bump redux-thunk from 2.4.0 to 2.4.1 (#17074)

Bumps [redux-thunk](https://github.com/reduxjs/redux-thunk) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/reduxjs/redux-thunk/releases)
- [Commits](https://github.com/reduxjs/redux-thunk/compare/v2.4.0...v2.4.1)

---
updated-dependencies:
- dependency-name: redux-thunk
  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.3 to 8.3.0 (#17076)
dependabot[bot] [Sat, 4 Dec 2021 14:40:19 +0000 (23:40 +0900)]
Bump ws from 8.2.3 to 8.3.0 (#17076)

Bumps [ws](https://github.com/websockets/ws) from 8.2.3 to 8.3.0.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/8.2.3...8.3.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 @testing-library/jest-dom from 5.15.0 to 5.15.1 (#17081)
dependabot[bot] [Sat, 4 Dec 2021 14:39:18 +0000 (23:39 +0900)]
Bump @testing-library/jest-dom from 5.15.0 to 5.15.1 (#17081)

Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.15.0 to 5.15.1.
- [Release notes](https://github.com/testing-library/jest-dom/releases)
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.15.0...v5.15.1)

---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
  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.43.4 to 1.43.5 (#17080)
dependabot[bot] [Sat, 4 Dec 2021 14:39:00 +0000 (23:39 +0900)]
Bump sass from 1.43.4 to 1.43.5 (#17080)

Bumps [sass](https://github.com/sass/dart-sass) from 1.43.4 to 1.43.5.
- [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.43.4...1.43.5)

---
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 babel-jest from 27.3.1 to 27.4.0 (#17078)
dependabot[bot] [Sat, 4 Dec 2021 14:38:38 +0000 (23:38 +0900)]
Bump babel-jest from 27.3.1 to 27.4.0 (#17078)

Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 27.3.1 to 27.4.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.4.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 agoFix unneeded outline around list name edition input
Claire [Fri, 3 Dec 2021 18:13:43 +0000 (19:13 +0100)]
Fix unneeded outline around list name edition input

4 years agoPrevent translations from accidentally becoming completely different from source...
gunchleoc [Wed, 1 Dec 2021 18:03:35 +0000 (19:03 +0100)]
Prevent translations from accidentally becoming completely different from source strings on Crowdin without translators noticing. (#17085)

4 years agoMerge pull request #1643 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Tue, 30 Nov 2021 16:34:22 +0000 (17:34 +0100)]
Merge pull request #1643 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Tue, 30 Nov 2021 11:13:54 +0000 (12:13 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoFix error on trending mailer due to missing constant (#17072)
Eugen Rochko [Mon, 29 Nov 2021 16:39:40 +0000 (17:39 +0100)]
Fix error on trending mailer due to missing constant (#17072)

4 years agoBump @babel/plugin-transform-runtime from 7.16.0 to 7.16.4 (#17023)
dependabot[bot] [Mon, 29 Nov 2021 06:41:17 +0000 (15:41 +0900)]
Bump @babel/plugin-transform-runtime from 7.16.0 to 7.16.4 (#17023)

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

---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-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>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
4 years agoBump cld3 from 3.4.2 to 3.4.3 (#17047)
dependabot[bot] [Mon, 29 Nov 2021 06:19:22 +0000 (15:19 +0900)]
Bump cld3 from 3.4.2 to 3.4.3 (#17047)

Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.4.2 to 3.4.3.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases)
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.4.2...v3.4.3)

---
updated-dependencies:
- dependency-name: cld3
  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.106.0 to 1.107.0 (#17048)
dependabot[bot] [Mon, 29 Nov 2021 06:18:59 +0000 (15:18 +0900)]
Bump aws-sdk-s3 from 1.106.0 to 1.107.0 (#17048)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.106.0 to 1.107.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/preset-env from 7.16.0 to 7.16.4 (#17024)
dependabot[bot] [Mon, 29 Nov 2021 06:18:41 +0000 (15:18 +0900)]
Bump @babel/preset-env from 7.16.0 to 7.16.4 (#17024)

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.16.0 to 7.16.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.16.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 server graph on admin/tags/:id (#17066)
Jeong Arm [Sun, 28 Nov 2021 22:13:07 +0000 (07:13 +0900)]
Fix server graph on admin/tags/:id (#17066)

4 years agoUpdate tootsuite/mastodon Docker tag to v3.4.4 (#17065)
Alexandra Catalina [Sat, 27 Nov 2021 02:06:39 +0000 (18:06 -0800)]
Update tootsuite/mastodon Docker tag to v3.4.4 (#17065)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
4 years agoMerge pull request #1640 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Fri, 26 Nov 2021 22:41:01 +0000 (23:41 +0100)]
Merge pull request #1640 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years ago[Glitch] Fix searching for additional hashtags in hashtag column
Claire [Fri, 26 Nov 2021 21:11:09 +0000 (22:11 +0100)]
[Glitch] Fix searching for additional hashtags in hashtag column

Port 3f382e337d5c40db18995a88c0bf6b1b34f031b7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years ago[Glitch] Fix color of hashtag column settings inputs
Claire [Fri, 26 Nov 2021 21:09:11 +0000 (22:09 +0100)]
[Glitch] Fix color of hashtag column settings inputs

Port 1630807ee2517e7a9dbb66cbd532a0c46e01abcf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Fri, 26 Nov 2021 21:53:55 +0000 (22:53 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `.env.production.sample`:
  Copied upstream changes.
- `app/controllers/settings/identity_proofs_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `app/controllers/well_known/keybase_proof_config_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `lib/mastodon/statuses_cli.rb`:
  Minor conflict due to an optimization that wasn't shared between
  the two versions. Copied upstream's version.

4 years agoFix admin statuses order(#16937) (#16969)
Jeong Arm [Fri, 26 Nov 2021 21:12:27 +0000 (06:12 +0900)]
Fix admin statuses order(#16937) (#16969)

* Fix #16937

* Add test for statuses order

4 years agoFix searching for additional hashtags in hashtag column (#17054)
Claire [Fri, 26 Nov 2021 21:11:09 +0000 (22:11 +0100)]
Fix searching for additional hashtags in hashtag column (#17054)

4 years agoFix color of hashtag column settings inputs (#17058)
Claire [Fri, 26 Nov 2021 21:09:11 +0000 (22:09 +0100)]
Fix color of hashtag column settings inputs (#17058)

Fixes #17057

4 years agoFix performance of tootctl statuses remove (#17052)
Takeshi Umeda [Fri, 26 Nov 2021 21:08:47 +0000 (06:08 +0900)]
Fix performance of tootctl statuses remove (#17052)

* Fix performance of tootctl statuses remove

* Fix model class

4 years agoFix opening wrong profile when clicking on username of boosting user in WebUI (#17060)
Claire [Fri, 26 Nov 2021 21:04:09 +0000 (22:04 +0100)]
Fix opening wrong profile when clicking on username of boosting user in WebUI (#17060)

Fixes #16799

4 years agoUpgrade bootsnap for Ruby 3.0.3 (#17064)
zunda [Fri, 26 Nov 2021 21:03:35 +0000 (21:03 +0000)]
Upgrade bootsnap for Ruby 3.0.3 (#17064)

https://github.com/Shopify/bootsnap/blob/v1.9.3/CHANGELOG.md#193

4 years ago[Glitch] Port upstream changes about trending links
Jeong Arm [Fri, 26 Nov 2021 06:01:04 +0000 (15:01 +0900)]
[Glitch] Port upstream changes about trending links

4 years agoFix ElasticSearch to Elasticsearch (#17050)
Takeshi Umeda [Fri, 26 Nov 2021 07:30:02 +0000 (16:30 +0900)]
Fix ElasticSearch to Elasticsearch (#17050)

4 years agoAdd batch_size option to bin/tootctl search deploy (#17049)
OSAMU SATO [Fri, 26 Nov 2021 07:29:53 +0000 (16:29 +0900)]
Add batch_size option to bin/tootctl search deploy (#17049)

4 years agoBump sprockets-rails from 3.4.0 to 3.4.1 (#17021)
dependabot[bot] [Fri, 26 Nov 2021 05:06:23 +0000 (14:06 +0900)]
Bump sprockets-rails from 3.4.0 to 3.4.1 (#17021)

Bumps [sprockets-rails](https://github.com/rails/sprockets-rails) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/rails/sprockets-rails/releases)
- [Commits](https://github.com/rails/sprockets-rails/compare/v3.4.0...v3.4.1)

---
updated-dependencies:
- dependency-name: sprockets-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 agoBump eslint-plugin-react from 7.27.0 to 7.27.1 (#17022)
dependabot[bot] [Fri, 26 Nov 2021 05:06:12 +0000 (14:06 +0900)]
Bump eslint-plugin-react from 7.27.0 to 7.27.1 (#17022)

Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.27.0 to 7.27.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.27.0...v7.27.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-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 reselect from 4.1.2 to 4.1.4 (#17025)
dependabot[bot] [Fri, 26 Nov 2021 05:01:53 +0000 (14:01 +0900)]
Bump reselect from 4.1.2 to 4.1.4 (#17025)

Bumps [reselect](https://github.com/reduxjs/reselect) from 4.1.2 to 4.1.4.
- [Release notes](https://github.com/reduxjs/reselect/releases)
- [Changelog](https://github.com/reduxjs/reselect/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/reselect/compare/v4.1.2...v4.1.4)

---
updated-dependencies:
- dependency-name: reselect
  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/plugin-proposal-decorators from 7.16.0 to 7.16.4 (#17027)
dependabot[bot] [Fri, 26 Nov 2021 05:01:31 +0000 (14:01 +0900)]
Bump @babel/plugin-proposal-decorators from 7.16.0 to 7.16.4 (#17027)

Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators) from 7.16.0 to 7.16.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.16.4/packages/babel-plugin-proposal-decorators)

---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-decorators"
  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 agoRemove Keybase integration (#17045)
Eugen Rochko [Fri, 26 Nov 2021 04:58:18 +0000 (05:58 +0100)]
Remove Keybase integration (#17045)

4 years agoMerge pull request #1637 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Fri, 26 Nov 2021 00:25:29 +0000 (01:25 +0100)]
Merge pull request #1637 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Fri, 26 Nov 2021 00:15:32 +0000 (01:15 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoRevert "Fix trends admin page crashing"
Claire [Fri, 26 Nov 2021 00:15:29 +0000 (01:15 +0100)]
Revert "Fix trends admin page crashing"

This reverts commit 5f10e64330635bfd609ba5acdd78fa505c12f5b1.

4 years agoFix error on trending hashtags/links pages in admin UI due to missing constant (...
Eugen Rochko [Fri, 26 Nov 2021 00:12:39 +0000 (01:12 +0100)]
Fix error on trending hashtags/links pages in admin UI due to missing constant (#17044)

4 years agoMerge pull request #1636 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Fri, 26 Nov 2021 00:12:09 +0000 (01:12 +0100)]
Merge pull request #1636 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoFix trends admin page crashing
Claire [Thu, 25 Nov 2021 23:26:06 +0000 (00:26 +0100)]
Fix trends admin page crashing

4 years agoDisable trending links review request emails
Claire [Thu, 25 Nov 2021 22:53:28 +0000 (23:53 +0100)]
Disable trending links review request emails

4 years ago[Glitch] Fix handling of recursive toots in WebUI
Claire [Thu, 25 Nov 2021 22:46:39 +0000 (23:46 +0100)]
[Glitch] Fix handling of recursive toots in WebUI

Port b1fd6d44901a13450d22884b02eb6e9ae4fc1248 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Thu, 25 Nov 2021 22:49:17 +0000 (23:49 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/views/admin/tags/index.html.haml`:
  Removed upstream while it had changes in glitch-soc to accomodate for the
  theming system.

Additional changes to accomodate for the theming system:
- `app/views/admin/trends/links/preview_card_providers/index.html.haml`
- `app/views/admin/trends/links/index.html.haml`
- `app/views/admin/trends/tags/index.html.haml`
- `app/views/admin/tags/show.html.haml`

4 years agoFix handling of recursive toots in WebUI (#17041)
Claire [Thu, 25 Nov 2021 22:46:39 +0000 (23:46 +0100)]
Fix handling of recursive toots in WebUI (#17041)

4 years agoFix filtering DMs from non-followed users (#17042)
Claire [Thu, 25 Nov 2021 22:46:30 +0000 (23:46 +0100)]
Fix filtering DMs from non-followed users (#17042)

4 years agoMerge pull request #1635 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Thu, 25 Nov 2021 19:21:25 +0000 (20:21 +0100)]
Merge pull request #1635 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Thu, 25 Nov 2021 17:42:18 +0000 (18:42 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoAdd trending links (#16917)
Eugen Rochko [Thu, 25 Nov 2021 12:07:38 +0000 (13:07 +0100)]
Add trending links (#16917)

* Add trending links

* Add overriding specific links trendability

* Add link type to preview cards and only trend articles

Change trends review notifications from being sent every 5 minutes to being sent every 2 hours

Change threshold from 5 unique accounts to 15 unique accounts

* Fix tests

4 years agoUpgrade Ruby to 3.0.3 (#17038)
zunda [Wed, 24 Nov 2021 19:29:05 +0000 (19:29 +0000)]
Upgrade Ruby to 3.0.3 (#17038)

https://www.ruby-lang.org/en/news/2021/11/24/ruby-3-0-3-released/

4 years agoBetter ordering for bug report issue template (#17019)
trwnh [Wed, 24 Nov 2021 19:24:09 +0000 (13:24 -0600)]
Better ordering for bug report issue template (#17019)

Logically, it makes more sense to provide the steps leading up to the bug before asking what the bug is. This change moves "steps to reproduce" above "expected behavior" and "actual behavior" to enforce the above progression and logical flow.

4 years agoFix error when suspending user with an already-existing canonical email block (#17036)
Claire [Wed, 24 Nov 2021 16:41:03 +0000 (17:41 +0100)]
Fix error when suspending user with an already-existing canonical email block (#17036)

* Fix error when suspending user with an already-existing canonical email block

Fixes #17033

While attempting to create a `CanonicalEmailBlock` with an existing hash would
raise an `ActiveRecord::RecordNotUnique` error, this being done within a
transaction would cancel the whole transaction. For this reason, checking for
uniqueness in Rails would query the database within the transaction and avoid
invalidating the whole transaction for this reason.

A race condition is still possible, where multiple accounts sharing a canonical
email would be blocked in concurrent transactions, in which only one would
succeed, but that is way less likely to happen that the current issue, and can
always be retried after the first failure, unlike the current situation.

* Add tests

4 years agoAdd FEDERATION.md (#17029)
Claire [Mon, 22 Nov 2021 23:15:31 +0000 (00:15 +0100)]
Add FEDERATION.md (#17029)

Some ActivityPub projects have a FEDERATION.md which is used to describe the
various extensions they use.

Everything here is also documented elsewhere, but it's a concise starting point
with links to that documentation.

4 years agoMerge pull request #1634 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Fri, 19 Nov 2021 18:55:02 +0000 (19:55 +0100)]
Merge pull request #1634 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years ago[Glitch] Fix overflow of long profile fields in admin view
Claire [Fri, 19 Nov 2021 17:22:49 +0000 (18:22 +0100)]
[Glitch] Fix overflow of long profile fields in admin view

Port db32835338e113f23a474d323e398916a999619f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Fri, 19 Nov 2021 17:51:41 +0000 (18:51 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoFix overflow of long profile fields in admin view (#17010)
Claire [Fri, 19 Nov 2021 17:22:49 +0000 (18:22 +0100)]
Fix overflow of long profile fields in admin view (#17010)

4 years agoFix background-color of emoji-mart selector (#17011)
Claire [Fri, 19 Nov 2021 17:21:37 +0000 (18:21 +0100)]
Fix background-color of emoji-mart selector (#17011)

Reverts part of #16907 to fix hardcoded color

4 years agoBump chewy from 5.2.0 to 7.2.3 (supports Elasticsearch 7.x) (#16915)
Takeshi Umeda [Thu, 18 Nov 2021 21:02:08 +0000 (06:02 +0900)]
Bump chewy from 5.2.0 to 7.2.3 (supports Elasticsearch 7.x) (#16915)

* Bump chewy from 5.2.0 to 7.2.2

* fix style (codeclimate)

* fix style

* fix style

* Bump chewy from 7.2.2 to 7.2.3

4 years agoAdd lazy load to emoji-mart (#16907)
Mashiro [Thu, 18 Nov 2021 21:01:31 +0000 (05:01 +0800)]
Add lazy load to emoji-mart (#16907)

* perf: lazyload emoji-mart!

* Bump lazyload

4 years agoUpdate Dockerfile (#16939)
Shlee [Thu, 18 Nov 2021 21:00:38 +0000 (08:00 +1100)]
Update Dockerfile (#16939)

4 years ago[Docker-Compose] [Breaking] Postgres 9.6 is EOL (11th Nov 2021) - Migrate to 14 Stabl...
Shlee [Thu, 18 Nov 2021 21:00:27 +0000 (08:00 +1100)]
[Docker-Compose] [Breaking] Postgres 9.6 is EOL (11th Nov 2021) - Migrate to 14 Stable (#16947)

* Update docker-compose.yml

* Update docker-compose.yml

* Update docker-compose.yml

* Update docker-compose.yml

4 years agoRuby 3.0.2 Upgrade (#16982)
Shlee [Thu, 18 Nov 2021 20:59:57 +0000 (07:59 +1100)]
Ruby 3.0.2 Upgrade (#16982)

* Update .ruby-version

* Update Gemfile

* Update Gemfile.lock

* Update Dockerfile

* Update check-i18n.yml

* Update config.yml

* Update config.yml

4 years ago[Dockerfile] Upgrade ElasticSearch-OSS 6.8.10 to 7.10.2 (#16956)
Shlee [Thu, 18 Nov 2021 20:59:34 +0000 (07:59 +1100)]
[Dockerfile] Upgrade ElasticSearch-OSS 6.8.10 to 7.10.2 (#16956)

* Update docker-compose.yml

* Update docker-compose.yml

* Update docker-compose.yml

4 years agoBump aws-sdk-s3 from 1.105.1 to 1.106.0 (#17001)
dependabot[bot] [Thu, 18 Nov 2021 00:44:23 +0000 (09:44 +0900)]
Bump aws-sdk-s3 from 1.105.1 to 1.106.0 (#17001)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.105.1 to 1.106.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 mime-types from 3.4.0 to 3.4.1 (#17002)
dependabot[bot] [Thu, 18 Nov 2021 00:44:08 +0000 (09:44 +0900)]
Bump mime-types from 3.4.0 to 3.4.1 (#17002)

Bumps [mime-types](https://github.com/mime-types/ruby-mime-types) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/mime-types/ruby-mime-types/releases)
- [Changelog](https://github.com/mime-types/ruby-mime-types/blob/main/History.md)
- [Commits](https://github.com/mime-types/ruby-mime-types/compare/v3.4.0...v3.4.1)

---
updated-dependencies:
- dependency-name: mime-types
  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-jsx-a11y from 6.4.1 to 6.5.1 (#16993)
dependabot[bot] [Thu, 18 Nov 2021 00:42:12 +0000 (09:42 +0900)]
Bump eslint-plugin-jsx-a11y from 6.4.1 to 6.5.1 (#16993)

Bumps [eslint-plugin-jsx-a11y](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y) from 6.4.1 to 6.5.1.
- [Release notes](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/releases)
- [Changelog](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/compare/v6.4.1...v6.5.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-jsx-a11y
  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 letter_opener_web from 1.4.1 to 2.0.0 (#16960)
dependabot[bot] [Thu, 18 Nov 2021 00:20:31 +0000 (09:20 +0900)]
Bump letter_opener_web from 1.4.1 to 2.0.0 (#16960)

Bumps [letter_opener_web](https://github.com/fgrehm/letter_opener_web) from 1.4.1 to 2.0.0.
- [Release notes](https://github.com/fgrehm/letter_opener_web/releases)
- [Changelog](https://github.com/fgrehm/letter_opener_web/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fgrehm/letter_opener_web/compare/v1.4.1...v2.0.0)

---
updated-dependencies:
- dependency-name: letter_opener_web
  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 agoBump eslint-plugin-import from 2.25.2 to 2.25.3 (#16995)
dependabot[bot] [Thu, 18 Nov 2021 00:08:10 +0000 (09:08 +0900)]
Bump eslint-plugin-import from 2.25.2 to 2.25.3 (#16995)

Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.25.2 to 2.25.3.
- [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.25.2...v2.25.3)

---
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 @babel/runtime from 7.16.0 to 7.16.3 (#16994)
dependabot[bot] [Thu, 18 Nov 2021 00:07:56 +0000 (09:07 +0900)]
Bump @babel/runtime from 7.16.0 to 7.16.3 (#16994)

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.16.0 to 7.16.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.16.3/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 eslint-plugin-react from 7.26.1 to 7.27.0 (#16992)
dependabot[bot] [Thu, 18 Nov 2021 00:07:15 +0000 (09:07 +0900)]
Bump eslint-plugin-react from 7.26.1 to 7.27.0 (#16992)

Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.26.1 to 7.27.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.26.1...v7.27.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 mime-types from 3.3.1 to 3.4.0 (#16991)
dependabot[bot] [Thu, 18 Nov 2021 00:06:58 +0000 (09:06 +0900)]
Bump mime-types from 3.3.1 to 3.4.0 (#16991)

Bumps [mime-types](https://github.com/mime-types/ruby-mime-types) from 3.3.1 to 3.4.0.
- [Release notes](https://github.com/mime-types/ruby-mime-types/releases)
- [Changelog](https://github.com/mime-types/ruby-mime-types/blob/main/History.md)
- [Commits](https://github.com/mime-types/ruby-mime-types/compare/v3.3.1...v3.4.0)

---
updated-dependencies:
- dependency-name: mime-types
  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 sprockets-rails from 3.2.2 to 3.4.0 (#16990)
dependabot[bot] [Thu, 18 Nov 2021 00:06:40 +0000 (09:06 +0900)]
Bump sprockets-rails from 3.2.2 to 3.4.0 (#16990)

Bumps [sprockets-rails](https://github.com/rails/sprockets-rails) from 3.2.2 to 3.4.0.
- [Release notes](https://github.com/rails/sprockets-rails/releases)
- [Commits](https://github.com/rails/sprockets-rails/compare/v3.2.2...v3.4.0)

---
updated-dependencies:
- dependency-name: sprockets-rails
  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.22.3 to 1.23.0 (#16989)
dependabot[bot] [Thu, 18 Nov 2021 00:06:26 +0000 (09:06 +0900)]
Bump rubocop from 1.22.3 to 1.23.0 (#16989)

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.22.3 to 1.23.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.22.3...v1.23.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>