]> cat aescling's git repositories - mastodon.git/log
cat aescling's git repositories / mastodon.git / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
mastodon.git
4 years agoFix toggling sidebar on mobile in admin pages
commit | commitdiff | tree
Claire [Wed, 16 Feb 2022 15:15:22 +0000 (16:15 +0100)]
Fix toggling sidebar on mobile in admin pages

4 years agoMerge pull request #1691 from ClearlyClaire/glitch-soc/merge-upstream
commit | commitdiff | tree
Claire [Sat, 12 Feb 2022 21:43:43 +0000 (22:43 +0100)]
Merge pull request #1691 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years ago[Glitch] Fix controls for unchangeable properties on status edit not being disabled
commit | commitdiff | tree
Claire [Sat, 12 Feb 2022 18:00:33 +0000 (19:00 +0100)]
[Glitch] Fix controls for unchangeable properties on status edit not being disabled

Port 38845592c4b4456b5b407bd320249613a0f16e13 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
commit | commitdiff | tree
Claire [Sat, 12 Feb 2022 20:36:33 +0000 (21:36 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoMake the settings button go to settings when opened in a new tab
commit | commitdiff | tree
Holly [Thu, 3 Feb 2022 13:36:52 +0000 (13:36 +0000)]
Make the settings button go to settings when opened in a new tab

4 years agoFix empty batch statuses selection causing a 500 error (#17532)
commit | commitdiff | tree
Claire [Sat, 12 Feb 2022 18:52:17 +0000 (19:52 +0100)]
Fix empty batch statuses selection causing a 500 error (#17532)

* Fix empty batch statuses selection causing a 500 error

* Simplify current_params

4 years agoFix controls for unchangeable properties on status edit not being disabled (#17531)
commit | commitdiff | tree
Claire [Sat, 12 Feb 2022 18:00:33 +0000 (19:00 +0100)]
Fix controls for unchangeable properties on status edit not being disabled (#17531)

Fixes #17520

4 years agoBump chewy from 7.2.3 to 7.2.4 (#17529)
commit | commitdiff | tree
Yamagishi Kazutoshi [Sat, 12 Feb 2022 17:07:42 +0000 (02:07 +0900)]
Bump chewy from 7.2.3 to 7.2.4 (#17529)

4 years agoFix attempts at distributing Update activities for local-only posts
commit | commitdiff | tree
Claire [Sat, 12 Feb 2022 13:39:01 +0000 (14:39 +0100)]
Fix attempts at distributing Update activities for local-only posts

4 years agoMerge pull request #1688 from ClearlyClaire/glitch-soc/merge-upstream
commit | commitdiff | tree
Claire [Sat, 12 Feb 2022 13:33:01 +0000 (14:33 +0100)]
Merge pull request #1688 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years ago[Glitch] Fix layout of the report page on smaller screens in admin UI
commit | commitdiff | tree
Eugen Rochko [Sat, 12 Feb 2022 00:08:23 +0000 (01:08 +0100)]
[Glitch] Fix layout of the report page on smaller screens in admin UI

Port e848d281d55a3c753f6dc8d9f32a3d7eb9b9a2ff to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years ago[Glitch] Add notifications when a reblogged status has been updated
commit | commitdiff | tree
Eugen Rochko [Fri, 11 Feb 2022 21:20:19 +0000 (22:20 +0100)]
[Glitch] Add notifications when a reblogged status has been updated

Port front-end changes from 8f03b7a2fb4b420eb46942157160816185e81751 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoBump ws from 8.4.2 to 8.5.0 (#17467)
commit | commitdiff | tree
dependabot[bot] [Sat, 12 Feb 2022 11:50:49 +0000 (20:50 +0900)]
Bump ws from 8.4.2 to 8.5.0 (#17467)

Bumps [ws](https://github.com/websockets/ws) from 8.4.2 to 8.5.0.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/8.4.2...8.5.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 ox from 2.14.7 to 2.14.9 (#17528)
commit | commitdiff | tree
dependabot[bot] [Sat, 12 Feb 2022 11:50:17 +0000 (20:50 +0900)]
Bump ox from 2.14.7 to 2.14.9 (#17528)

Bumps [ox](https://github.com/ohler55/ox) from 2.14.7 to 2.14.9.
- [Release notes](https://github.com/ohler55/ox/releases)
- [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/ox/compare/v2.14.7...v2.14.9)

---
updated-dependencies:
- dependency-name: ox
  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-preval from 5.0.0 to 5.1.0 (#17475)
commit | commitdiff | tree
dependabot[bot] [Sat, 12 Feb 2022 11:21:56 +0000 (20:21 +0900)]
Bump babel-plugin-preval from 5.0.0 to 5.1.0 (#17475)

Bumps [babel-plugin-preval](https://github.com/kentcdodds/babel-plugin-preval) from 5.0.0 to 5.1.0.
- [Release notes](https://github.com/kentcdodds/babel-plugin-preval/releases)
- [Changelog](https://github.com/kentcdodds/babel-plugin-preval/blob/main/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/babel-plugin-preval/compare/v5.0.0...v5.1.0)

---
updated-dependencies:
- dependency-name: babel-plugin-preval
  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 branch 'main' into glitch-soc/merge-upstream
commit | commitdiff | tree
Claire [Sat, 12 Feb 2022 10:12:41 +0000 (11:12 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoBump follow-redirects from 1.14.7 to 1.14.8 (#17527)
commit | commitdiff | tree
dependabot[bot] [Sat, 12 Feb 2022 00:09:31 +0000 (01:09 +0100)]
Bump follow-redirects from 1.14.7 to 1.14.8 (#17527)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  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 agoFix layout of the report page on smaller screens in admin UI (#17523)
commit | commitdiff | tree
Eugen Rochko [Sat, 12 Feb 2022 00:08:23 +0000 (01:08 +0100)]
Fix layout of the report page on smaller screens in admin UI (#17523)

Fix #17491

4 years agoFix missing javascript in some admin pages
commit | commitdiff | tree
Claire [Fri, 11 Feb 2022 22:53:35 +0000 (23:53 +0100)]
Fix missing javascript in some admin pages

4 years agoAdd support for multiple source files per pack
commit | commitdiff | tree
Claire [Fri, 11 Feb 2022 22:52:42 +0000 (23:52 +0100)]
Add support for multiple source files per pack

4 years agoRefactor compile-time glitch-soc theme handling
commit | commitdiff | tree
Claire [Fri, 11 Feb 2022 22:06:37 +0000 (23:06 +0100)]
Refactor compile-time glitch-soc theme handling

4 years agoBump puma from 5.6.1 to 5.6.2 (#17526)
commit | commitdiff | tree
dependabot[bot] [Fri, 11 Feb 2022 22:16:52 +0000 (23:16 +0100)]
Bump puma from 5.6.1 to 5.6.2 (#17526)

Bumps [puma](https://github.com/puma/puma) from 5.6.1 to 5.6.2.
- [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.6.1...v5.6.2)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoEnable domain purge button on suspended domains too (#17209)
commit | commitdiff | tree
Jeong Arm [Fri, 11 Feb 2022 21:23:19 +0000 (06:23 +0900)]
Enable domain purge button on suspended domains too (#17209)

* Enable domain purge button on suspended domains too

* Change unless to if

4 years agoMerge pull request #1684 from ClearlyClaire/glitch-soc/merge-upstream
commit | commitdiff | tree
Claire [Fri, 11 Feb 2022 21:22:25 +0000 (22:22 +0100)]
Merge pull request #1684 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoAdd notifications when a reblogged status has been updated (#17404)
commit | commitdiff | tree
Eugen Rochko [Fri, 11 Feb 2022 21:20:19 +0000 (22:20 +0100)]
Add notifications when a reblogged status has been updated (#17404)

* Add notifications when a reblogged status has been updated

* Change wording to say "edit" instead of "update" and add missing controls

* Replace previous update notifications with the most up-to-date one

4 years ago[Glitch] Change actions in reports to require only one click
commit | commitdiff | tree
Eugen Rochko [Fri, 11 Feb 2022 20:51:57 +0000 (21:51 +0100)]
[Glitch] Change actions in reports to require only one click

Port SCSS changes from d0fcf07436d158bcac2617d076a83d0aa49c39e6

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
commit | commitdiff | tree
Claire [Fri, 11 Feb 2022 20:53:20 +0000 (21:53 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoChange actions in reports to require only one click (#17487)
commit | commitdiff | tree
Eugen Rochko [Fri, 11 Feb 2022 20:51:57 +0000 (21:51 +0100)]
Change actions in reports to require only one click (#17487)

4 years agoChange reblogs to not count towards hashtag trends anymore (#17501)
commit | commitdiff | tree
Eugen Rochko [Fri, 11 Feb 2022 20:16:23 +0000 (21:16 +0100)]
Change reblogs to not count towards hashtag trends anymore (#17501)

4 years agoHelm chart SSO support (#17205)
commit | commitdiff | tree
bobbyd0g [Fri, 11 Feb 2022 14:01:40 +0000 (09:01 -0500)]
Helm chart SSO support (#17205)

* Add SAML support

* move extAuth below essential components

* Add CAS, PAM, LDAP support

* Add WEB_DOMAIN and S3_ALIAS_HOST support

* SAML defaults aligned

* Bump chart version

* SSO & WEB_DOMAIN support added

* Add OIDC support

* Correct typo

* Notice for OIDC support

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
4 years agoFix deletes not being signed in authorized fetch mode (#17484)
commit | commitdiff | tree
Eugen Rochko [Fri, 11 Feb 2022 13:52:45 +0000 (14:52 +0100)]
Fix deletes not being signed in authorized fetch mode (#17484)

Fix #17483

4 years agoFix Undo Announce sometimes inlining the originally Announced status (#17516)
commit | commitdiff | tree
Claire [Fri, 11 Feb 2022 13:52:07 +0000 (14:52 +0100)]
Fix Undo Announce sometimes inlining the originally Announced status (#17516)

* Change tests to have more specific expectations on sent ActivityPub payloads

* Check that payload doesn't actually contain the contents of the boosted toot

* Fix Undo Announce sometimes inlining the originally Announced status

4 years agoNew Crowdin updates (#16858)
commit | commitdiff | tree
Eugen Rochko [Fri, 11 Feb 2022 03:50:27 +0000 (04:50 +0100)]
New Crowdin updates (#16858)

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.json (French)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.json (French)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations devise.en.yml (French)
[ci skip]

* New translations devise.en.yml (French)
[ci skip]

* New translations activerecord.en.yml (French)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Scottish Gaelic)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Hebrew)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.json (Slovenian)
[ci skip]

* New translations en.json (Slovenian)
[ci skip]

* New translations activerecord.en.yml (Slovenian)
[ci skip]

* New translations en.yml (Slovenian)
[ci skip]

* New translations doorkeeper.en.yml (Slovenian)
[ci skip]

* New translations activerecord.en.yml (Slovenian)
[ci skip]

* New translations simple_form.en.yml (Slovenian)
[ci skip]

* New translations devise.en.yml (Slovenian)
[ci skip]

* New translations simple_form.en.yml (Slovenian)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.json (Slovenian)
[ci skip]

* New translations devise.en.yml (Slovenian)
[ci skip]

* New translations en.json (Slovenian)
[ci skip]

* New translations en.json (Slovenian)
[ci skip]

* New translations en.yml (Slovenian)
[ci skip]

* New translations en.json (Slovenian)
[ci skip]

* New translations doorkeeper.en.yml (Slovenian)
[ci skip]

* New translations en.yml (Slovenian)
[ci skip]

* New translations en.yml (Slovenian)
[ci skip]

* New translations simple_form.en.yml (Slovenian)
[ci skip]

* New translations devise.en.yml (Slovenian)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Slovenian)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Catalan)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations simple_form.en.yml (Catalan)
[ci skip]

* New translations simple_form.en.yml (Catalan)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.json (Catalan)
[ci skip]

* New translations simple_form.en.yml (Catalan)
[ci skip]

* New translations doorkeeper.en.yml (Catalan)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.json (Catalan)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations en.yml (Occitan)
[ci skip]

* New translations en.json (Occitan)
[ci skip]

* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]

* New translations en.json (Arabic)
[ci skip]

* New translations en.json (Arabic)
[ci skip]

* New translations en.json (Arabic)
[ci skip]

* New translations en.json (Arabic)
[ci skip]

* New translations en.json (Arabic)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Norwegian)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Armenian)
[ci skip]

* New translations en.yml (Georgian)
[ci skip]

* New translations en.yml (Lithuanian)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Norwegian)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.yml (Albanian)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations en.yml (Serbian (Cyrillic))
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Finnish)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Slovenian)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Scottish Gaelic)
[ci skip]

* New translations en.yml (Occitan)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Romanian)
[ci skip]

* New translations en.yml (Czech)
[ci skip]

* New translations en.yml (Danish)
[ci skip]

* New translations en.yml (Spanish, Mexico)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (Sardinian)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.yml (Sorani (Kurdish))
[ci skip]

* New translations en.yml (Kurmanji (Kurdish))
[ci skip]

* New translations en.yml (Asturian)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations en.yml (Welsh)
[ci skip]

* New translations en.yml (Latvian)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations en.yml (Kazakh)
[ci skip]

* New translations en.yml (Norwegian Nynorsk)
[ci skip]

* New translations en.yml (Kurmanji (Kurdish))
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Hebrew)
[ci skip]

* New translations en.json (Hebrew)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Albanian)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Danish)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations en.yml (Latvian)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations devise.en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations devise.en.yml (Thai)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations devise.en.yml (Thai)
[ci skip]

* New translations devise.en.yml (Thai)
[ci skip]

* New translations en.yml (Spanish, Mexico)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations en.yml (Latvian)
[ci skip]

* New translations en.yml (Kurmanji (Kurdish))
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Danish)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.json (Greek)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.json (Greek)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Slovenian)
[ci skip]

* New translations simple_form.en.yml (Slovenian)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations simple_form.en.yml (Polish)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* Ran `i18n-tasks normalize`

* Ran `yarn manage:translations`

* Add space

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
4 years agoBump @babel/plugin-transform-runtime from 7.16.10 to 7.17.0 (#17474)
commit | commitdiff | tree
dependabot[bot] [Fri, 11 Feb 2022 02:59:31 +0000 (11:59 +0900)]
Bump @babel/plugin-transform-runtime from 7.16.10 to 7.17.0 (#17474)

Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.16.10 to 7.17.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.17.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 agoBump @babel/core from 7.16.12 to 7.17.2 (#17510)
commit | commitdiff | tree
dependabot[bot] [Fri, 11 Feb 2022 02:59:26 +0000 (11:59 +0900)]
Bump @babel/core from 7.16.12 to 7.17.2 (#17510)

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.16.12 to 7.17.2.
- [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.17.2/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 jest from 27.4.7 to 27.5.1 (#17512)
commit | commitdiff | tree
dependabot[bot] [Fri, 11 Feb 2022 02:59:12 +0000 (11:59 +0900)]
Bump jest from 27.4.7 to 27.5.1 (#17512)

Bumps [jest](https://github.com/facebook/jest) from 27.4.7 to 27.5.1.
- [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.4.7...v27.5.1)

---
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.16.1 to 5.16.2 (#17469)
commit | commitdiff | tree
dependabot[bot] [Fri, 11 Feb 2022 01:54:19 +0000 (10:54 +0900)]
Bump @testing-library/jest-dom from 5.16.1 to 5.16.2 (#17469)

Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.16.1 to 5.16.2.
- [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.16.1...v5.16.2)

---
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.49.0 to 1.49.7 (#17470)
commit | commitdiff | tree
dependabot[bot] [Fri, 11 Feb 2022 01:53:51 +0000 (10:53 +0900)]
Bump sass from 1.49.0 to 1.49.7 (#17470)

Bumps [sass](https://github.com/sass/dart-sass) from 1.49.0 to 1.49.7.
- [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.49.0...1.49.7)

---
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.4.6 to 27.5.0 (#17477)
commit | commitdiff | tree
dependabot[bot] [Fri, 11 Feb 2022 01:53:06 +0000 (10:53 +0900)]
Bump babel-jest from 27.4.6 to 27.5.0 (#17477)

Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 27.4.6 to 27.5.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.5.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 @babel/runtime from 7.16.7 to 7.17.0 (#17473)
commit | commitdiff | tree
dependabot[bot] [Fri, 11 Feb 2022 01:50:45 +0000 (10:50 +0900)]
Bump @babel/runtime from 7.16.7 to 7.17.0 (#17473)

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.16.7 to 7.17.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.17.0/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/plugin-proposal-decorators from 7.16.7 to 7.17.0 (#17468)
commit | commitdiff | tree
dependabot[bot] [Fri, 11 Feb 2022 01:50:09 +0000 (10:50 +0900)]
Bump @babel/plugin-proposal-decorators from 7.16.7 to 7.17.0 (#17468)

Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators) from 7.16.7 to 7.17.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.17.0/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 sidekiq-unique-jobs from 7.1.12 to 7.1.15 (#17505)
commit | commitdiff | tree
dependabot[bot] [Fri, 11 Feb 2022 01:49:31 +0000 (10:49 +0900)]
Bump sidekiq-unique-jobs from 7.1.12 to 7.1.15 (#17505)

Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 7.1.12 to 7.1.15.
- [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.12...v7.1.15)

---
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 agoFix some flaky tests that randomly failed because of item ordering (#17509)
commit | commitdiff | tree
Claire [Thu, 10 Feb 2022 21:00:10 +0000 (22:00 +0100)]
Fix some flaky tests that randomly failed because of item ordering (#17509)

4 years agoMerge pull request #1683 from ClearlyClaire/glitch-soc/merge-upstream
commit | commitdiff | tree
Claire [Thu, 10 Feb 2022 20:07:48 +0000 (21:07 +0100)]
Merge pull request #1683 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoImprove tests involving push_bulk (#17508)
commit | commitdiff | tree
Claire [Thu, 10 Feb 2022 18:42:45 +0000 (19:42 +0100)]
Improve tests involving push_bulk (#17508)

sidekiq-bulk's push_bulk can either accept arguments directly or run them
through a block.

Setting expectations on the result of evaluating the blocks allows testing
more code (the block itself) and the test is moved closer to the *interface*
of the tested code than its precise implementation.

4 years ago[Glitch] Chore: Disable menu items for editing statuses in web UI (#17497)
commit | commitdiff | tree
Eugen Rochko [Thu, 10 Feb 2022 14:28:53 +0000 (15:28 +0100)]
[Glitch] Chore: Disable menu items for editing statuses in web UI (#17497)

Port 3dc1e3cfc3928ce709c3e60e98ecbd1edd6e2a7d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years ago[Glitch] Add editing for published statuses
commit | commitdiff | tree
Eugen Rochko [Wed, 9 Feb 2022 23:15:30 +0000 (00:15 +0100)]
[Glitch] Add editing for published statuses

Port 63002cde03a836b4510aca5da564504ecaedb5e9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoAdd ability to change content-type when editing a toot
commit | commitdiff | tree
Claire [Thu, 10 Feb 2022 08:13:27 +0000 (09:13 +0100)]
Add ability to change content-type when editing a toot

Content-type defaults to edited toot's content-type to avoid surprising
behaviors when using clients that do not support this feature.

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
commit | commitdiff | tree
Claire [Thu, 10 Feb 2022 18:09:27 +0000 (19:09 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Upstream moved things around in a place where glitch-soc had support for
  an extra parameter (`content_type`).
  Follow upstream but reintroduce `content_type`.

4 years agoChore: Disable menu items for editing statuses in web UI (#17497)
commit | commitdiff | tree
Eugen Rochko [Thu, 10 Feb 2022 14:28:53 +0000 (15:28 +0100)]
Chore: Disable menu items for editing statuses in web UI (#17497)

Feature must be unlocked in a separate release for max. compatibility

4 years agoBump fabrication from 2.24.0 to 2.27.0 (#17447)
commit | commitdiff | tree
dependabot[bot] [Thu, 10 Feb 2022 14:25:42 +0000 (15:25 +0100)]
Bump fabrication from 2.24.0 to 2.27.0 (#17447)

Bumps [fabrication](https://gitlab.com/fabrication-gem/fabrication) from 2.24.0 to 2.27.0.
- [Release notes](https://gitlab.com/fabrication-gem/fabrication/tags)
- [Changelog](https://gitlab.com/fabrication-gem/fabrication/blob/master/Changelog.markdown)
- [Commits](https://gitlab.com/fabrication-gem/fabrication/compare/2.24.0...2.27.0)

---
updated-dependencies:
- dependency-name: fabrication
  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.25.0 to 1.25.1 (#17446)
commit | commitdiff | tree
dependabot[bot] [Thu, 10 Feb 2022 14:12:33 +0000 (15:12 +0100)]
Bump rubocop from 1.25.0 to 1.25.1 (#17446)

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.25.0 to 1.25.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.25.0...v1.25.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 agoBump aws-sdk-s3 from 1.111.3 to 1.112.0 (#17452)
commit | commitdiff | tree
dependabot[bot] [Thu, 10 Feb 2022 14:12:09 +0000 (15:12 +0100)]
Bump aws-sdk-s3 from 1.111.3 to 1.112.0 (#17452)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.111.3 to 1.112.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.10.2 to 1.10.3 (#17466)
commit | commitdiff | tree
dependabot[bot] [Thu, 10 Feb 2022 14:11:41 +0000 (15:11 +0100)]
Bump bootsnap from 1.10.2 to 1.10.3 (#17466)

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.10.2 to 1.10.3.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.10.2...v1.10.3)

---
updated-dependencies:
- dependency-name: bootsnap
  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 ox from 2.14.6 to 2.14.7 (#17453)
commit | commitdiff | tree
dependabot[bot] [Thu, 10 Feb 2022 14:11:16 +0000 (15:11 +0100)]
Bump ox from 2.14.6 to 2.14.7 (#17453)

Bumps [ox](https://github.com/ohler55/ox) from 2.14.6 to 2.14.7.
- [Release notes](https://github.com/ohler55/ox/releases)
- [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/ox/compare/v2.14.6...v2.14.7)

---
updated-dependencies:
- dependency-name: ox
  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 pg from 1.3.0 to 1.3.1 (#17450)
commit | commitdiff | tree
dependabot[bot] [Thu, 10 Feb 2022 14:10:47 +0000 (15:10 +0100)]
Bump pg from 1.3.0 to 1.3.1 (#17450)

Bumps [pg](https://github.com/ged/ruby-pg) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.3.0...v1.3.1)

---
updated-dependencies:
- dependency-name: pg
  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 puma from 5.5.2 to 5.6.1 (#17411)
commit | commitdiff | tree
dependabot[bot] [Thu, 10 Feb 2022 14:09:06 +0000 (15:09 +0100)]
Bump puma from 5.5.2 to 5.6.1 (#17411)

Bumps [puma](https://github.com/puma/puma) from 5.5.2 to 5.6.1.
- [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.5.2...v5.6.1)

---
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 from 6.4.0 to 6.4.1 (#17480)
commit | commitdiff | tree
dependabot[bot] [Thu, 10 Feb 2022 14:07:06 +0000 (15:07 +0100)]
Bump sidekiq from 6.4.0 to 6.4.1 (#17480)

Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.4.0 to 6.4.1.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v6.4.0...v6.4.1)

---
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 agoFix NoMethodError in StatusUpdateDistributionWorker (#17499)
commit | commitdiff | tree
Claire [Thu, 10 Feb 2022 13:57:10 +0000 (14:57 +0100)]
Fix NoMethodError in StatusUpdateDistributionWorker (#17499)

* Add tests

* Fix NoMethodError in StatusUpdateDistributionWorker

* Fix tests

4 years agoFix poll votes not being properly reset on poll change (#17498)
commit | commitdiff | tree
Claire [Thu, 10 Feb 2022 13:26:54 +0000 (14:26 +0100)]
Fix poll votes not being properly reset on poll change (#17498)

* Fix poll votes not being properly reset on poll change

* Fix and add tests

* Fix poll update handling when the number of options changes

4 years agoFix outdated iso-639 reference in update status service (#17496)
commit | commitdiff | tree
Eugen Rochko [Thu, 10 Feb 2022 02:09:44 +0000 (03:09 +0100)]
Fix outdated iso-639 reference in update status service (#17496)

4 years agoAdd editing for published statuses (#17320)
commit | commitdiff | tree
Eugen Rochko [Wed, 9 Feb 2022 23:15:30 +0000 (00:15 +0100)]
Add editing for published statuses (#17320)

* Add editing for published statuses

* Fix change of multiple-choice boolean in poll not resetting votes

* Remove the ability to update existing media attachments for now

4 years agoChore: Update browserslist (#17493)
commit | commitdiff | tree
Eugen Rochko [Wed, 9 Feb 2022 23:10:27 +0000 (00:10 +0100)]
Chore: Update browserslist (#17493)

4 years agoAdd `category` and `rule_ids` params to `POST /api/v1/reports` (#17492)
commit | commitdiff | tree
Eugen Rochko [Wed, 9 Feb 2022 23:10:16 +0000 (00:10 +0100)]
Add `category` and `rule_ids` params to `POST /api/v1/reports` (#17492)

4 years agoMerge pull request #1681 from ClearlyClaire/glitch-soc/merge-upstream
commit | commitdiff | tree
Claire [Wed, 9 Feb 2022 18:48:05 +0000 (19:48 +0100)]
Merge pull request #1681 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoAdd content_type to status_edits
commit | commitdiff | tree
Claire [Wed, 9 Feb 2022 16:59:43 +0000 (17:59 +0100)]
Add content_type to status_edits

4 years ago[Glitch] Add edit history to web UI
commit | commitdiff | tree
Eugen Rochko [Wed, 9 Feb 2022 00:17:07 +0000 (01:17 +0100)]
[Glitch] Add edit history to web UI

Port fd3a45e3482e86dad3c1dfc069144864c4ff0b0b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
commit | commitdiff | tree
Claire [Wed, 9 Feb 2022 16:28:33 +0000 (17:28 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream renamed some helper functions that were used in a part of the
  settings page which glitch-soc slightly changed the layout of.
  Ported the change.

4 years agoMerge pull request #1682 from ClearlyClaire/glitch-soc/fixes/dropdowns-modals
commit | commitdiff | tree
Claire [Wed, 9 Feb 2022 16:25:57 +0000 (17:25 +0100)]
Merge pull request #1682 from ClearlyClaire/glitch-soc/fixes/dropdowns-modals

Refactor and fix dropdown/action dialog

4 years agoPlease Codeclimate
commit | commitdiff | tree
Claire [Wed, 9 Feb 2022 16:15:36 +0000 (17:15 +0100)]
Please Codeclimate

4 years agoRework actions modal to bring it closer to upstream and fix modal stacking issue
commit | commitdiff | tree
Claire [Wed, 9 Feb 2022 13:39:12 +0000 (14:39 +0100)]
Rework actions modal to bring it closer to upstream and fix modal stacking issue

4 years agoRemove unused noModal prop
commit | commitdiff | tree
Claire [Wed, 9 Feb 2022 12:49:49 +0000 (13:49 +0100)]
Remove unused noModal prop

4 years agoSome more refactoring
commit | commitdiff | tree
Claire [Wed, 9 Feb 2022 12:41:17 +0000 (13:41 +0100)]
Some more refactoring

4 years agoRefactor dropdown and action modal code slightly
commit | commitdiff | tree
Claire [Wed, 9 Feb 2022 11:23:57 +0000 (12:23 +0100)]
Refactor dropdown and action modal code slightly

Simplify it a bit and make it closer to upstream

4 years agoAdd support >= 1.22 (#17490)
commit | commitdiff | tree
Takuya Yoshida [Wed, 9 Feb 2022 11:30:00 +0000 (20:30 +0900)]
Add support >= 1.22 (#17490)

4 years agoChange languages to be listed under standard instead of native name in admin UI ...
commit | commitdiff | tree
Eugen Rochko [Wed, 9 Feb 2022 03:15:38 +0000 (04:15 +0100)]
Change languages to be listed under standard instead of native name in admin UI (#17485)

4 years agoAdd edit history to web UI (#17390)
commit | commitdiff | tree
Eugen Rochko [Wed, 9 Feb 2022 00:17:07 +0000 (01:17 +0100)]
Add edit history to web UI (#17390)

* Add edit history to web UI

* Change history reducer to store items per status

* Fix missing loading prop

4 years agoFix error in suggestions API due to typo (#17486)
commit | commitdiff | tree
Eugen Rochko [Tue, 8 Feb 2022 21:23:04 +0000 (22:23 +0100)]
Fix error in suggestions API due to typo (#17486)

Regression from #17479

4 years agoMerge pull request #1680 from ClearlyClaire/glitch-soc/merge-upstream
commit | commitdiff | tree
Claire [Tue, 8 Feb 2022 18:43:59 +0000 (19:43 +0100)]
Merge pull request #1680 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
commit | commitdiff | tree
Claire [Tue, 8 Feb 2022 17:23:53 +0000 (18:23 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoRemove language detection through cld3 (#17478)
commit | commitdiff | tree
Eugen Rochko [Tue, 8 Feb 2022 01:41:17 +0000 (02:41 +0100)]
Remove language detection through cld3 (#17478)

* Remove language detection through cld3

* Update app/helpers/languages_helper.rb

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
4 years agoAdd global `locale` param (#17464)
commit | commitdiff | tree
Eugen Rochko [Tue, 8 Feb 2022 01:34:56 +0000 (02:34 +0100)]
Add global `locale` param (#17464)

- Remove the session-based locale stickyness

4 years agoFix localization of cold-start follow recommendations (#17479)
commit | commitdiff | tree
Eugen Rochko [Tue, 8 Feb 2022 00:53:49 +0000 (01:53 +0100)]
Fix localization of cold-start follow recommendations (#17479)

4 years agoFix Ruby 2.5 incompatibility (#17465)
commit | commitdiff | tree
Claire [Mon, 7 Feb 2022 18:57:06 +0000 (19:57 +0100)]
Fix Ruby 2.5 incompatibility (#17465)

4 years agoFix structured data parsing from links choking on bad data (#17403)
commit | commitdiff | tree
Eugen Rochko [Mon, 7 Feb 2022 17:16:31 +0000 (18:16 +0100)]
Fix structured data parsing from links choking on bad data (#17403)

* Fix structured data parsing from links choking on bad data

- Fix og:url meta tag being prioritized over canonical link tag
- Fix structured data parsing choking on commented-out CDATA declarations
- Fix HTML entities in title, description, provider_name, author_name
- Change structured data parsing to attempt every JSON-LD script tag

* Remove unnecessary slash escapes from CDATA regex pattern

4 years agoFix replies collection incorrectly looping (#17462)
commit | commitdiff | tree
Claire [Mon, 7 Feb 2022 16:06:43 +0000 (17:06 +0100)]
Fix replies collection incorrectly looping (#17462)

* Refactor tests

* Add tests

* Fix replies collection incorrectly looping

4 years agoFix errors when multiple Delete are received for a given actor (#17460)
commit | commitdiff | tree
Claire [Mon, 7 Feb 2022 12:14:48 +0000 (13:14 +0100)]
Fix errors when multiple Delete are received for a given actor (#17460)

4 years agoMerge pull request #1679 from ClearlyClaire/glitch-soc/merge-upstream
commit | commitdiff | tree
Claire [Sun, 6 Feb 2022 15:23:57 +0000 (16:23 +0100)]
Merge pull request #1679 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
commit | commitdiff | tree
Claire [Sun, 6 Feb 2022 14:34:42 +0000 (15:34 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `CHANGELOG.md`:
  Upstream added newlines.
  Conflicts are because the CHANGELOG was independently merged from 3.4.6 on
  last security update.
  Took upstream's version.
- `app/helpers/context_helper.rb`:
  Conflicts because of extra vocabulary in glitch-soc. The conflicts were
  actually handled in last security merge.
  Kept our version.

4 years agoFix instance actor not being dereferenceable (#17457)
commit | commitdiff | tree
Claire [Sun, 6 Feb 2022 14:31:03 +0000 (15:31 +0100)]
Fix instance actor not being dereferenceable (#17457)

* Add tests

* Fix instance actor not being dereferenceable

* Fix tests

* Fix tests for real

4 years agoUpdate build-image.yml (#17454)
commit | commitdiff | tree
potpro [Sat, 5 Feb 2022 16:29:54 +0000 (01:29 +0900)]
Update build-image.yml (#17454)

4 years agoMerge pull request #1678 from ClearlyClaire/glitch-soc/fixes/robust-theme-fallback
commit | commitdiff | tree
Claire [Sat, 5 Feb 2022 12:24:05 +0000 (13:24 +0100)]
Merge pull request #1678 from ClearlyClaire/glitch-soc/fixes/robust-theme-fallback

Make theme-selection fall back to default ones if configured is not found

4 years agoMove glitch-soc-specific theming methods to ThemingConcern
commit | commitdiff | tree
Claire [Sat, 5 Feb 2022 09:58:51 +0000 (10:58 +0100)]
Move glitch-soc-specific theming methods to ThemingConcern

4 years agoMake theme-selection fall back to default ones if configured is not found
commit | commitdiff | tree
Claire [Sat, 5 Feb 2022 09:27:24 +0000 (10:27 +0100)]
Make theme-selection fall back to default ones if configured is not found

4 years agoFix error on account relationships page in admin UI (#17444)
commit | commitdiff | tree
Eugen Rochko [Sat, 5 Feb 2022 04:06:34 +0000 (05:06 +0100)]
Fix error on account relationships page in admin UI (#17444)

4 years agoBump brakeman from 5.2.0 to 5.2.1 (#17410)
commit | commitdiff | tree
dependabot[bot] [Sat, 5 Feb 2022 04:03:12 +0000 (13:03 +0900)]
Bump brakeman from 5.2.0 to 5.2.1 (#17410)

Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v5.2.0...v5.2.1)

---
updated-dependencies:
- dependency-name: brakeman
  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 redis from 4.0.2 to 4.0.3 (#17412)
commit | commitdiff | tree
dependabot[bot] [Sat, 5 Feb 2022 04:03:06 +0000 (13:03 +0900)]
Bump redis from 4.0.2 to 4.0.3 (#17412)

Bumps [redis](https://github.com/redis/node-redis) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/redis/node-redis/releases)
- [Changelog](https://github.com/redis/node-redis/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/node-redis/compare/redis@4.0.2...redis@4.0.3)

---
updated-dependencies:
- dependency-name: redis
  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-scheduler from 3.1.0 to 3.1.1 (#17407)
commit | commitdiff | tree
dependabot[bot] [Sat, 5 Feb 2022 04:02:57 +0000 (13:02 +0900)]
Bump sidekiq-scheduler from 3.1.0 to 3.1.1 (#17407)

Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases)
- [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v3.1.0...v3.1.1)

---
updated-dependencies:
- dependency-name: sidekiq-scheduler
  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 http-link-header from 1.0.3 to 1.0.4 (#17414)
commit | commitdiff | tree
dependabot[bot] [Sat, 5 Feb 2022 04:02:42 +0000 (13:02 +0900)]
Bump http-link-header from 1.0.3 to 1.0.4 (#17414)

Bumps [http-link-header](https://github.com/jhermsmeier/node-http-link-header) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/jhermsmeier/node-http-link-header/releases)
- [Changelog](https://github.com/jhermsmeier/node-http-link-header/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jhermsmeier/node-http-link-header/compare/v1.0.3...v1.0.4)

---
updated-dependencies:
- dependency-name: http-link-header
  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 tootsuite/mastodon Docker tag to v3.4.6 (#17436)
commit | commitdiff | tree
Alexandra Catalina [Thu, 3 Feb 2022 20:29:20 +0000 (12:29 -0800)]
Update tootsuite/mastodon Docker tag to v3.4.6 (#17436)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
next
source code fur Kibicat Mastodon