cat aescling's git repositories - mastodon.git/log

]> cat aescling's git repositories - mastodon.git/log

cat aescling's git repositories / mastodon.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

dependabot[bot] [Thu, 14 Apr 2022 12:21:05 +0000 (21:21 +0900)]

Bump sidekiq-unique-jobs from 7.1.16 to 7.1.19 (#18018)

Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 7.1.16 to 7.1.19.
- [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.16...v7.1.19)

---
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>

commit | commitdiff | tree

dependabot[bot] [Thu, 14 Apr 2022 12:20:27 +0000 (21:20 +0900)]

Bump @babel/runtime from 7.17.8 to 7.17.9 (#18012)

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

commit | commitdiff | tree

dependabot[bot] [Thu, 14 Apr 2022 12:20:01 +0000 (21:20 +0900)]

Bump @babel/plugin-proposal-decorators from 7.17.8 to 7.17.9 (#18020)

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

commit | commitdiff | tree

Claire [Wed, 20 Apr 2022 19:29:31 +0000 (21:29 +0200)]

Swap position of media attachments and polls

commit | commitdiff | tree

Claire [Tue, 19 Apr 2022 12:54:43 +0000 (14:54 +0200)]

Revert support from loading Home timeline from database

Unfortunately, the database query could turn out very inefficient and I did not
manage to find a way to improve that. Furthermore, there were still behavior
inconsistencies between fetching the timeline from Redis and fetching it from
Postgres.

commit | commitdiff | tree

Claire [Sat, 16 Apr 2022 19:20:07 +0000 (21:20 +0200)]

Revert DM support in HomeFeed#from_database

Fixes #1746

Queries could get prohibitively expensive.

commit | commitdiff | tree

Claire [Thu, 14 Apr 2022 15:44:21 +0000 (17:44 +0200)]

Fix loading Home TL from database not respecting `min_id` and not including DMs (#1744)

* Rework tests

* Add tests

* Fix HomeFeed#get with min_id fetching from database

* Minor code cleanup and optimizations

* Add tests

* Take DMs into account when fetching home TL from database

* Fix not listing own DMs in Home timeline

* Add tests

* Please CodeClimate

commit | commitdiff | tree

dependabot[bot] [Thu, 14 Apr 2022 10:31:20 +0000 (19:31 +0900)]

Bump i18n-tasks from 1.0.8 to 1.0.9 (#18014)

commit | commitdiff | tree

dependabot[bot] [Thu, 14 Apr 2022 10:30:54 +0000 (19:30 +0900)]

Bump @babel/core from 7.17.8 to 7.17.9 (#18015)

commit | commitdiff | tree

dependabot[bot] [Thu, 14 Apr 2022 10:29:52 +0000 (19:29 +0900)]

Bump yargs from 17.4.0 to 17.4.1 (#18017)

commit | commitdiff | tree

Eugen Rochko [Wed, 13 Apr 2022 17:52:53 +0000 (19:52 +0200)]

New Crowdin updates (#17995)

* New translations en.json (Catalan)

* New translations en.yml (Persian)

* New translations en.yml (Romanian)

* New translations en.yml (Afrikaans)

* New translations en.yml (Bulgarian)

* New translations en.yml (Czech)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Spanish, Mexico)

* New translations en.yml (Sanskrit)

* New translations en.yml (Asturian)

* New translations en.yml (Serbian (Latin))

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.yml (Sorani (Kurdish))

* New translations en.yml (Corsican)

* New translations en.yml (Sardinian)

* New translations en.yml (Kabyle)

* New translations en.yml (Cornish)

* New translations en.yml (Ido)

* New translations en.yml (Taigi)

* New translations en.yml (Silesian)

* New translations en.yml (Standard Moroccan Tamazight)

* New translations en.json (Czech)

* New translations en.json (Hungarian)

* New translations en.yml (Kannada)

* New translations en.yml (Sinhala)

* New translations en.yml (Bengali)

* New translations en.yml (Hindi)

* New translations en.yml (Marathi)

* New translations en.yml (Croatian)

* New translations en.yml (Norwegian Nynorsk)

* New translations en.yml (Kazakh)

* New translations en.yml (Estonian)

* New translations en.yml (Latvian)

* New translations en.yml (Malay)

* New translations en.yml (Breton)

* New translations en.yml (Telugu)

* New translations en.yml (Welsh)

* New translations en.yml (Esperanto)

* New translations en.yml (Uyghur)

* New translations en.yml (Chinese Traditional, Hong Kong)

* New translations en.yml (Tatar)

* New translations en.yml (Malayalam)

* New translations en.json (Icelandic)

* New translations en.json (Vietnamese)

* New translations en.yml (Korean)

* New translations en.yml (Catalan)

* New translations en.yml (Czech)

* New translations en.yml (Icelandic)

* New translations en.json (Korean)

* New translations en.json (Polish)

* New translations en.yml (Albanian)

* New translations en.json (Albanian)

* New translations en.yml (Vietnamese)

* New translations en.yml (Chinese Traditional)

* New translations en.json (Chinese Traditional)

* New translations en.json (Vietnamese)

* New translations en.json (Russian)

* New translations en.yml (Russian)

* New translations en.json (Russian)

* New translations en.json (Latvian)

* New translations en.yml (Spanish, Argentina)

* New translations en.json (Spanish, Argentina)

* New translations en.yml (Danish)

* New translations en.yml (Latvian)

* New translations en.yml (Spanish)

* New translations en.json (Spanish)

* New translations simple_form.en.yml (Catalan)

* New translations simple_form.en.yml (Chinese Traditional)

* New translations simple_form.en.yml (Portuguese)

* New translations simple_form.en.yml (Russian)

* New translations simple_form.en.yml (Slovak)

* New translations simple_form.en.yml (Albanian)

* New translations simple_form.en.yml (Serbian (Cyrillic))

* New translations simple_form.en.yml (Swedish)

* New translations simple_form.en.yml (Turkish)

* New translations simple_form.en.yml (Ukrainian)

* New translations simple_form.en.yml (Dutch)

* New translations simple_form.en.yml (Vietnamese)

* New translations simple_form.en.yml (Galician)

* New translations simple_form.en.yml (Icelandic)

* New translations simple_form.en.yml (Portuguese, Brazilian)

* New translations simple_form.en.yml (Indonesian)

* New translations simple_form.en.yml (Persian)

* New translations simple_form.en.yml (Tamil)

* New translations simple_form.en.yml (Spanish, Argentina)

* New translations simple_form.en.yml (Spanish, Mexico)

* New translations simple_form.en.yml (Bengali)

* New translations simple_form.en.yml (Norwegian)

* New translations simple_form.en.yml (Slovenian)

* New translations simple_form.en.yml (Danish)

* New translations simple_form.en.yml (Chinese Simplified)

* New translations simple_form.en.yml (Thai)

* New translations simple_form.en.yml (Polish)

* New translations simple_form.en.yml (Romanian)

* New translations simple_form.en.yml (French)

* New translations simple_form.en.yml (Spanish)

* New translations simple_form.en.yml (Arabic)

* New translations simple_form.en.yml (Bulgarian)

* New translations simple_form.en.yml (Czech)

* New translations simple_form.en.yml (German)

* New translations simple_form.en.yml (Greek)

* New translations simple_form.en.yml (Basque)

* New translations simple_form.en.yml (Finnish)

* New translations simple_form.en.yml (Hebrew)

* New translations simple_form.en.yml (Hungarian)

* New translations simple_form.en.yml (Armenian)

* New translations simple_form.en.yml (Italian)

* New translations simple_form.en.yml (Japanese)

* New translations simple_form.en.yml (Georgian)

* New translations simple_form.en.yml (Korean)

* New translations simple_form.en.yml (Croatian)

* New translations simple_form.en.yml (Ido)

* New translations simple_form.en.yml (Kabyle)

* New translations simple_form.en.yml (Sardinian)

* New translations simple_form.en.yml (Corsican)

* New translations simple_form.en.yml (Sorani (Kurdish))

* New translations simple_form.en.yml (Kurmanji (Kurdish))

* New translations simple_form.en.yml (Serbian (Latin))

* New translations simple_form.en.yml (Occitan)

* New translations simple_form.en.yml (Asturian)

* New translations simple_form.en.yml (Scottish Gaelic)

* New translations simple_form.en.yml (Norwegian Nynorsk)

* New translations simple_form.en.yml (Sinhala)

* New translations simple_form.en.yml (Breton)

* New translations simple_form.en.yml (Malayalam)

* New translations simple_form.en.yml (Tatar)

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)

* New translations simple_form.en.yml (Esperanto)

* New translations simple_form.en.yml (Welsh)

* New translations simple_form.en.yml (Latvian)

* New translations simple_form.en.yml (Estonian)

* New translations simple_form.en.yml (Kazakh)

* New translations simple_form.en.yml (Standard Moroccan Tamazight)

* New translations simple_form.en.yml (Czech)

* New translations simple_form.en.yml (Latvian)

* New translations simple_form.en.yml (Spanish)

* New translations simple_form.en.yml (Czech)

* New translations simple_form.en.yml (Korean)

* New translations simple_form.en.yml (Russian)

* New translations simple_form.en.yml (Spanish, Argentina)

* New translations simple_form.en.yml (Polish)

* New translations en.json (Swedish)

* New translations en.yml (Italian)

* New translations en.json (Italian)

* New translations simple_form.en.yml (Italian)

* New translations simple_form.en.yml (Catalan)

* New translations en.yml (Portuguese)

* New translations en.json (Portuguese)

* New translations en.yml (Kurmanji (Kurdish))

* New translations simple_form.en.yml (Portuguese)

* New translations simple_form.en.yml (Russian)

* New translations en.json (French)

* New translations simple_form.en.yml (French)

* New translations en.json (Polish)

* New translations en.json (Polish)

* New translations en.yml (Kurmanji (Kurdish))

* New translations simple_form.en.yml (Kurmanji (Kurdish))

* New translations simple_form.en.yml (Arabic)

* New translations en.yml (Arabic)

* New translations simple_form.en.yml (Arabic)

* New translations doorkeeper.en.yml (Arabic)

* New translations en.yml (Arabic)

* New translations doorkeeper.en.yml (Arabic)

* New translations simple_form.en.yml (Chinese Traditional)

* New translations en.yml (Esperanto)

* New translations en.json (Esperanto)

* New translations en.yml (Esperanto)

* New translations en.yml (Turkish)

* New translations en.json (Turkish)

* New translations simple_form.en.yml (Turkish)

* New translations en.yml (Czech)

* New translations en.yml (Esperanto)

* New translations en.yml (Esperanto)

* New translations en.yml (Esperanto)

* New translations en.yml (Greek)

* New translations en.json (Greek)

* New translations simple_form.en.yml (Greek)

* New translations simple_form.en.yml (Icelandic)

* New translations en.yml (Czech)

* New translations en.yml (Ukrainian)

* New translations en.yml (Ukrainian)

* New translations en.json (Ukrainian)

* New translations simple_form.en.yml (Ukrainian)

* New translations en.yml (Ukrainian)

* New translations en.json (Ukrainian)

* New translations doorkeeper.en.yml (Ukrainian)

* New translations simple_form.en.yml (Danish)

* New translations en.yml (Galician)

* New translations en.json (Galician)

* New translations simple_form.en.yml (Galician)

* New translations simple_form.en.yml (Vietnamese)

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.yml (Esperanto)

* New translations en.yml (Esperanto)

* New translations en.yml (Esperanto)

* New translations en.yml (Esperanto)

* New translations en.yml (Esperanto)

* New translations en.yml (Esperanto)

* New translations en.json (French)

* New translations en.yml (Indonesian)

* New translations en.json (Indonesian)

* New translations en.yml (Indonesian)

* New translations simple_form.en.yml (Indonesian)

* New translations en.yml (Thai)

* New translations en.json (Thai)

* New translations simple_form.en.yml (Thai)

* New translations simple_form.en.yml (Thai)

* New translations en.yml (Armenian)

* New translations en.json (Armenian)

* New translations en.yml (Italian)

* New translations en.json (Italian)

* New translations en.yml (Catalan)

* New translations en.json (Catalan)

* New translations en.yml (Spanish, Argentina)

* New translations en.json (Kurmanji (Kurdish))

* New translations simple_form.en.yml (Hungarian)

* New translations en.yml (Chinese Simplified)

* New translations simple_form.en.yml (Chinese Simplified)

* New translations en.json (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.json (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations simple_form.en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.json (Polish)

* New translations en.json (Polish)

* New translations en.json (Polish)

* New translations en.json (Polish)

* New translations doorkeeper.en.yml (Polish)

* New translations doorkeeper.en.yml (Polish)

* New translations en.yml (Polish)

* New translations en.yml (Polish)

* New translations en.yml (Polish)

* New translations en.yml (Polish)

* New translations simple_form.en.yml (Polish)

* New translations en.json (Polish)

* New translations en.json (Polish)

* New translations en.json (Catalan)

* New translations en.json (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.json (Vietnamese)

* New translations en.json (Vietnamese)

* New translations en.yml (Vietnamese)

* Run `yarn manage:translations`

* Run `bundle exec i18n-tasks normalize`

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

commit | commitdiff | tree

Jeong Arm [Wed, 13 Apr 2022 11:25:42 +0000 (20:25 +0900)]

Fix FetchFeaturedCollectionService (#18030)

commit | commitdiff | tree

dependabot[bot] [Tue, 12 Apr 2022 12:20:40 +0000 (21:20 +0900)]

Bump nokogiri from 1.13.3 to 1.13.4 (#18025)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.3 to 1.13.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.4/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.3...v1.13.4)

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

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

commit | commitdiff | tree

Alexandra Catalina [Tue, 12 Apr 2022 01:26:50 +0000 (18:26 -0700)]

chore(deps): update tootsuite/mastodon docker tag to v3.5.1 (#18023)

Co-authored-by: Renovate Bot <bot@renovateapp.com>

commit | commitdiff | tree

dogelover911 [Mon, 11 Apr 2022 19:17:03 +0000 (14:17 -0500)]

FeedManager: skip account when target_account's last status is too old (#18009)

Co-authored-by: dogelover911 <dogelover911@localhost>

commit | commitdiff | tree

Jeong Arm [Tue, 12 Apr 2022 15:52:14 +0000 (00:52 +0900)]

Implement infinity home timeline (#1610)

* Implement infinity home timeline

* Fix test for infinite home timeline

* Fix infinity home timeline with min_id

* Fix infinite home timeline duplicated statuses

* Codeclimate for infinite home timeline

* Refactor code as reviewed

* Fix redis sufficient check

* Fix typo on variable name

commit | commitdiff | tree

single-right-quote [Sat, 30 Apr 2022 22:44:01 +0000 (18:44 -0400)]

Re-add Procfile.dev

This file is used to start processes necessary to run the software
locally; it would be very convenient to have it back.

commit | commitdiff | tree

aescling [Wed, 27 Apr 2022 07:39:48 +0000 (07:39 +0000)]

Allow forcing tags to be reported as trending

Using a comma-separated list in the evironment variable
`ALWAYS_TRENDING_TAGS`. The report bypasses the need to have marked
the tags set to always trend tags as approved. (It does not mark them
as approved.)

* Adjust code to better satisfy upstream rubocop

This edits upstream code (as modified for this commit)

* Refactor to get always-trending tags from environment

And for simpler method stubbing in testing.

The original form of the commit forced a single particular tag to
trend. @kibigo correctly suggested to handle this generically.

* [DRAFT, TODO] Add tests for new always-trending tags code

* Refactor Api::V1::Trends::TagsController for testing

* Add tests for always-trending tags

* Adopt @kibigo's suggestions

As per
https://gitlab.com/kibicat/mastodon/-/merge_requests/7#note_931604764
and
https://gitlab.com/kibicat/mastodon/-/merge_requests/7#note_931607104

commit | commitdiff | tree

Holly [Tue, 23 Feb 2021 01:43:31 +0000 (01:43 +0000)]

allow one-option polls

commit | commitdiff | tree

Claire [Mon, 11 Apr 2022 06:40:18 +0000 (08:40 +0200)]

Fix link sanitization for outgoing text/html and text/markdown toots

Fixes #1739

commit | commitdiff | tree

Claire [Sat, 9 Apr 2022 18:11:06 +0000 (20:11 +0200)]

Fix crash in alias settings page (#18004)

commit | commitdiff | tree

kibigo! [Sun, 10 Apr 2022 18:51:17 +0000 (11:51 -0700)]

Add initial guidelines for Git(Lab)

commit | commitdiff | tree

0x2019 [Sat, 9 Apr 2022 23:39:24 +0000 (23:39 +0000)]

Improve `from` search prefix error handling (#37)

* Make `from` search prefix more robust (addresses mastodon/mastodon#17941)

* Improve robustness for account string validation

Using unsupported prefixes now reports a 422; searching for posts from an
account the instance is not aware of reports a 404. TODO: The UI for this
on the front end is abysmal.

Searching `from:username@domain` now succeeds when `domain` is the local
domain; searching `from:@username(@domain)?` now works as expected.

* Satisfy upstream rubcocp

* Unbreak upstream tests

* Make account string validation consistent with mention processing

We previously matched on one-character domains and domains ending with
`[\.-]`, allowing `from:@a@a` and `from:@a@a-` searches to cause an
account lookup. This commit will raise a syntax error in both cases, as
MENTION_RE would never match them.

* Refactor `from` prefix error handling.

Incorporates changes suggested in #37. In doing so, adopts an error
handling style more consistent with the existing codebase (for which I
must thank @ClearlyClaire).

Removes new code no longer in use.

commit | commitdiff | tree

kibigo! [Sat, 9 Apr 2022 21:41:34 +0000 (14:41 -0700)]

Remove files not used for Kibicat development

These can always be added back in later if needed. I would like to also
  get rid of a lot of the linting configuration files, but for the time
  being it would probably be best to maintain the same linting
  practices as upstream.

commit | commitdiff | tree

kibigo! [Sat, 9 Apr 2022 02:50:34 +0000 (19:50 -0700)]

Merge pull request #41 from kibicat/glitch-soc-v3.5.1

Merge Mastodon 3.5.1 with adjustments for Kibicat Mastodon

commit | commitdiff | tree

single-right-quote [Sat, 9 Apr 2022 00:08:23 +0000 (00:08 +0000)]

Revert "Fix error resposes for `from` search prefix (#17963)"

This reverts commit 012537452a1b9087ea085253e8d42fe4129cea42. This
version of the fix is incompatible with changes introduced here, and we
prefer the functionality of our change.

commit | commitdiff | tree

single-right-quote [Sat, 9 Apr 2022 00:06:38 +0000 (00:06 +0000)]

Merge remote-tracking branch 'glitch-soc' into glitch-soc-v3.5.1

Update to Mastodon 3.5.1, as merged into glitch-soc.

commit | commitdiff | tree

Claire [Fri, 8 Apr 2022 21:07:00 +0000 (23:07 +0200)]

Merge pull request #1738 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

commit | commitdiff | tree

Claire [Fri, 8 Apr 2022 21:00:03 +0000 (23:00 +0200)]

Merge branch 'main' into glitch-soc/merge-upstream

commit | commitdiff | tree

Claire [Fri, 8 Apr 2022 20:24:07 +0000 (22:24 +0200)]

Merge pull request #1737 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

commit | commitdiff | tree

Eugen Rochko [Fri, 8 Apr 2022 19:57:24 +0000 (21:57 +0200)]

Bump version to 3.5.1 (#18000)

commit | commitdiff | tree

0x2019 [Fri, 8 Apr 2022 19:21:49 +0000 (19:21 +0000)]

Fix error resposes for `from` search prefix (#17963)

* Fix error responses in `from` search prefix (addresses mastodon/mastodon#17941)

Using unsupported prefixes now reports a 422; searching for posts from an
account the instance is not aware of reports a 404. TODO: The UI for this
on the front end is abysmal.

Searching `from:username@domain` now succeeds when `domain` is the local
domain; searching `from:@username(@domain)?` now works as expected.

* Remove unused methods on new Error classes as they are not being used

Currently when `raise`d there are error messages being supplied, but
this is not actually being used. The associated `raise`s have been
edited accordingly.

* Remove needless comments

* Satisfy rubocop

* Try fixing tests being unable to find AccountFindingConcern methods

* Satisfy rubocop

* Simplify `from` prefix logic

This incorporates @ClearlyClaire's suggestion (see
https://github.com/mastodon/mastodon/pull/17963#pullrequestreview-933986737).

Accepctable account strings in `from:` clauses are more lenient than
before this commit; for example, `from:@user@example.org@asnteo +cat`
will not error, and return posts by @user@example.org containing the
word "cat". This is more consistent with how Mastodon matches mentions
in statuses. In addition, `from` clauses will not be checked for
syntatically invalid usernames or domain names, simply 404ing when
`Account.find_remote!` raises ActiveRecord::NotFound.

New code for this PR that is no longer used has been removed.

commit | commitdiff | tree

Yamagishi Kazutoshi [Fri, 8 Apr 2022 18:18:20 +0000 (03:18 +0900)]

Add v3.5.x to SECURITY.md (#17998)

commit | commitdiff | tree

Claire [Fri, 8 Apr 2022 17:17:54 +0000 (19:17 +0200)]

[Glitch] Auto-fill timeline gaps when getting re-connecting to Websocket/EventSource stream

Port a39bf04fe6b6a98547737cc15f42727428376e67 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

commit | commitdiff | tree

Claire [Thu, 7 Apr 2022 14:08:17 +0000 (16:08 +0200)]

[Glitch] Fix potentially missing statuses when reconnecting to websocket

Port ebe01ea194104b14af6cd6abe6d20637f1a3e140 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

commit | commitdiff | tree

Claire [Fri, 8 Apr 2022 17:53:32 +0000 (19:53 +0200)]

Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `Gemfile.lock`:
  Not a real conflict, just an upstream dependency udpated
  textually too close to a glitch-soc-only dependency.
  Updated dependencies like upstream.
- `app/controllers/settings/preferences_controller.rb`:
  Upstream added settings where we had extra glitch-soc-specific settings.
  Added upstream's new settings.
- `app/models/user.rb`:
  Upstream added settings where we had extra glitch-soc-specific settings.
  Added upstream's new settings.
- `config/i18n-tasks.yml`:
  Not a real conflict, just a new upstream line too textually close to
  a glitch-soc-only line.
  Ported upstream's change.

commit | commitdiff | tree

Eugen Rochko [Fri, 8 Apr 2022 17:35:31 +0000 (19:35 +0200)]

Fix dangling language-specific trends (#17997)

- Change score half-life for trending statuses from 2 to 6 hours
- Change score threshold for trimming old items from 1 to 0.3

commit | commitdiff | tree

Claire [Fri, 8 Apr 2022 17:17:54 +0000 (19:17 +0200)]

Auto-fill timeline gaps when getting re-connecting to Websocket/EventSource stream (#17987)

commit | commitdiff | tree

Claire [Fri, 8 Apr 2022 17:17:37 +0000 (19:17 +0200)]

Fix extremely rare race condition when deleting a toot or account (#17994)

commit | commitdiff | tree

Eugen Rochko [Fri, 8 Apr 2022 16:03:31 +0000 (18:03 +0200)]

Change e-mail notifications to only be sent when recipient is offline (#17984)

* Change e-mail notifications to only be sent when recipient is offline

Change the default for follow and mention notifications back on

* Add preference to always send e-mail notifications

* Change wording

commit | commitdiff | tree

Eugen Rochko [Fri, 8 Apr 2022 15:10:53 +0000 (17:10 +0200)]

Fix trends returning less results per page when filtered in REST API (#17996)

- Change filtering and pagination to occur in SQL instead of Redis
- Change rank/score displayed on trends in admin UI to be locale-specific

commit | commitdiff | tree

dependabot[bot] [Fri, 8 Apr 2022 11:14:50 +0000 (20:14 +0900)]

Bump i18n-tasks from 0.9.37 to 1.0.8 (#17993)

* Bump i18n-tasks from 0.9.37 to 1.0.8

Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.37 to 1.0.8.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.37...v1.0.8)

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

Signed-off-by: dependabot[bot] <support@github.com>
* Run `bundle exec i18n-tasks normalize`

* Add `admin_mailer.new_appeal.actions.*` to ignore_unused

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

commit | commitdiff | tree

Eugen Rochko [Fri, 8 Apr 2022 10:52:22 +0000 (12:52 +0200)]

New Crowdin updates (#17897)

* New translations en.yml (Danish)

* New translations en.yml (German)

* New translations en.yml (Basque)

* New translations en.yml (Finnish)

* New translations en.yml (Hungarian)

* New translations en.yml (Hebrew)

* New translations en.yml (Catalan)

* New translations en.yml (Spanish)

* New translations en.yml (French)

* New translations en.yml (Arabic)

* New translations en.yml (Armenian)

* New translations en.yml (Afrikaans)

* New translations en.yml (Polish)

* New translations en.yml (Punjabi)

* New translations en.yml (Serbian (Cyrillic))

* New translations en.yml (Portuguese)

* New translations en.yml (Albanian)

* New translations en.yml (Dutch)

* New translations en.yml (Turkish)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Urdu (Pakistan))

* New translations en.yml (Icelandic)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Indonesian)

* New translations en.yml (Tamil)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Norwegian)

* New translations en.yml (Korean)

* New translations en.yml (Macedonian)

* New translations en.yml (Slovenian)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Swedish)

* New translations en.yml (Italian)

* New translations en.yml (Japanese)

* New translations en.yml (Russian)

* New translations en.yml (Slovak)

* New translations en.yml (Vietnamese)

* New translations en.yml (Lithuanian)

* New translations en.yml (Scottish Gaelic)

* New translations en.yml (Occitan)

* New translations en.yml (Persian)

* New translations en.yml (Galician)

* New translations en.yml (Georgian)

* New translations en.yml (Spanish, Mexico)

* New translations en.yml (Bengali)

* New translations en.yml (Sinhala)

* New translations en.yml (Silesian)

* New translations en.yml (Taigi)

* New translations en.yml (Ido)

* New translations en.yml (Kabyle)

* New translations en.yml (Sanskrit)

* New translations en.yml (Sardinian)

* New translations en.yml (Corsican)

* New translations en.yml (Sorani (Kurdish))

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.yml (Serbian (Latin))

* New translations en.yml (Asturian)

* New translations en.yml (Kannada)

* New translations en.yml (Cornish)

* New translations en.yml (Breton)

* New translations en.yml (Marathi)

* New translations en.yml (Malayalam)

* New translations en.yml (Tatar)

* New translations en.yml (Chinese Traditional, Hong Kong)

* New translations en.yml (Uyghur)

* New translations en.yml (Esperanto)

* New translations en.yml (Welsh)

* New translations en.yml (Telugu)

* New translations en.yml (Malay)

* New translations en.yml (Hindi)

* New translations en.yml (Latvian)

* New translations en.yml (Estonian)

* New translations en.yml (Kazakh)

* New translations en.yml (Norwegian Nynorsk)

* New translations en.yml (Croatian)

* New translations en.yml (Standard Moroccan Tamazight)

* New translations en.yml (German)

* New translations en.yml (Icelandic)

* New translations en.yml (Catalan)

* New translations en.yml (Czech)

* New translations en.yml (Italian)

* New translations doorkeeper.en.yml (Czech)

* New translations en.yml (Danish)

* New translations en.json (Czech)

* New translations doorkeeper.en.yml (Czech)

* New translations en.yml (Czech)

* New translations doorkeeper.en.yml (Czech)

* New translations en.yml (Latvian)

* New translations doorkeeper.en.yml (Czech)

* New translations en.yml (Czech)

* New translations en.yml (Indonesian)

* New translations en.yml (Czech)

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.yml (Czech)

* New translations en.yml (Czech)

* New translations simple_form.en.yml (Czech)

* New translations en.yml (Czech)

* New translations en.yml (Hungarian)

* New translations simple_form.en.yml (Czech)

* New translations simple_form.en.yml (Czech)

* New translations en.yml (Korean)

* New translations en.yml (Spanish)

* New translations en.yml (Czech)

* New translations simple_form.en.yml (Czech)

* New translations en.yml (Czech)

* New translations en.yml (Portuguese)

* New translations en.yml (Polish)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Czech)

* New translations en.yml (Czech)

* New translations en.yml (Czech)

* New translations en.yml (Czech)

* New translations en.json (Chinese Traditional)

* New translations en.yml (Czech)

* New translations en.yml (Czech)

* New translations en.yml (Czech)

* New translations en.json (Chinese Traditional)

* New translations en.json (Chinese Traditional)

* New translations en.yml (Czech)

* New translations en.json (Chinese Traditional)

* New translations en.yml (Czech)

* New translations en.yml (Czech)

* New translations en.yml (Czech)

* New translations en.yml (Czech)

* New translations en.yml (Czech)

* New translations en.yml (Czech)

* New translations en.yml (Spanish, Argentina)

* New translations en.json (Chinese Traditional)

* New translations en.yml (Czech)

* New translations en.yml (Czech)

* New translations en.json (Italian)

* New translations en.yml (Galician)

* New translations en.yml (French)

* New translations en.yml (Vietnamese)

* New translations simple_form.en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations simple_form.en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations simple_form.en.yml (Vietnamese)

* New translations simple_form.en.yml (Vietnamese)

* New translations en.yml (Korean)

* New translations en.json (Korean)

* New translations simple_form.en.yml (Galician)

* New translations en.yml (Korean)

* New translations en.yml (Portuguese)

* New translations en.yml (Hungarian)

* New translations en.yml (Armenian)

* New translations en.yml (Dutch)

* New translations en.yml (Norwegian)

* New translations en.yml (Polish)

* New translations en.yml (Albanian)

* New translations en.yml (Basque)

* New translations en.yml (Turkish)

* New translations en.yml (Ukrainian)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Icelandic)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Indonesian)

* New translations en.yml (Tamil)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Finnish)

* New translations en.yml (Greek)

* New translations en.yml (Galician)

* New translations en.yml (Slovak)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Swedish)

* New translations en.yml (Arabic)

* New translations en.yml (French)

* New translations en.yml (Spanish)

* New translations en.yml (Catalan)

* New translations en.yml (Italian)

* New translations en.yml (Japanese)

* New translations en.yml (Russian)

* New translations en.yml (Slovenian)

* New translations en.yml (German)

* New translations en.yml (Vietnamese)

* New translations en.yml (Thai)

* New translations en.yml (Scottish Gaelic)

* New translations en.yml (Occitan)

* New translations en.yml (Persian)

* New translations en.yml (Romanian)

* New translations en.yml (Czech)

* New translations en.yml (Danish)

* New translations en.yml (Spanish, Mexico)

* New translations en.yml (Kabyle)

* New translations en.yml (Sardinian)

* New translations en.yml (Corsican)

* New translations en.yml (Sorani (Kurdish))

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.yml (Breton)

* New translations en.yml (Chinese Traditional, Hong Kong)

* New translations en.yml (Esperanto)

* New translations en.yml (Welsh)

* New translations en.yml (Latvian)

* New translations en.yml (Norwegian Nynorsk)

* New translations en.yml (Croatian)

* New translations en.yml (Catalan)

* New translations en.yml (Latvian)

* New translations en.yml (Catalan)

* New translations en.yml (Latvian)

* New translations en.yml (Icelandic)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Swedish)

* New translations en.yml (Russian)

* New translations en.yml (Czech)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Czech)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Danish)

* New translations en.yml (Danish)

* New translations en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Galician)

* New translations en.yml (Vietnamese)

* New translations en.yml (Galician)

* New translations en.yml (Turkish)

* New translations en.yml (Polish)

* New translations en.yml (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.yml (Italian)

* New translations en.yml (Spanish)

* New translations en.yml (Arabic)

* New translations en.json (Arabic)

* New translations doorkeeper.en.yml (Arabic)

* New translations en.yml (Arabic)

* New translations en.yml (French)

* New translations en.json (Arabic)

* New translations en.json (Arabic)

* New translations en.json (Arabic)

* New translations en.json (Breton)

* New translations en.yml (Arabic)

* New translations en.json (Arabic)

* New translations en.yml (Vietnamese)

* New translations en.yml (Korean)

* New translations en.yml (Vietnamese)

* New translations en.yml (Esperanto)

* New translations en.json (Esperanto)

* New translations en.json (Esperanto)

* New translations en.json (Esperanto)

* New translations en.json (Esperanto)

* New translations en.yml (Esperanto)

* New translations en.json (Esperanto)

* New translations en.yml (Esperanto)

* New translations en.yml (Esperanto)

* New translations en.yml (Esperanto)

* Run `yarn manage:translations`

* Run `bundle exec i18n-tasks normalzie`

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

commit | commitdiff | tree

Eugen Rochko [Fri, 8 Apr 2022 10:47:18 +0000 (12:47 +0200)]

Fix cookies secure flag being set when served over Tor (#17992)

commit | commitdiff | tree

dependabot[bot] [Fri, 8 Apr 2022 04:44:40 +0000 (13:44 +0900)]

Bump gitlab-omniauth-openid-connect from 0.5.0 to 0.9.1 (#17779)

Bumps [gitlab-omniauth-openid-connect](https://gitlab.com/gitlab-org/gitlab-omniauth-openid-connect) from 0.5.0 to 0.9.1.
- [Release notes](https://gitlab.com/gitlab-org/gitlab-omniauth-openid-connect/tags)
- [Changelog](https://gitlab.com/gitlab-org/gitlab-omniauth-openid-connect/blob/master/CHANGELOG.md)
- [Commits](https://gitlab.com/gitlab-org/gitlab-omniauth-openid-connect/compare/v0.5.0...v0.9.1)

---
updated-dependencies:
- dependency-name: gitlab-omniauth-openid-connect
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>

commit | commitdiff | tree

dependabot[bot] [Fri, 8 Apr 2022 04:40:23 +0000 (13:40 +0900)]

Bump fabrication from 2.27.0 to 2.28.0 (#17960)

Bumps [fabrication](https://gitlab.com/fabrication-gem/fabrication) from 2.27.0 to 2.28.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.27.0...2.28.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>

commit | commitdiff | tree

dependabot[bot] [Fri, 8 Apr 2022 04:40:05 +0000 (13:40 +0900)]

Bump lograge from 0.11.2 to 0.12.0 (#17961)

Bumps [lograge](https://github.com/roidrage/lograge) from 0.11.2 to 0.12.0.
- [Release notes](https://github.com/roidrage/lograge/releases)
- [Changelog](https://github.com/roidrage/lograge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/roidrage/lograge/compare/v0.11.2...v0.12.0)

---
updated-dependencies:
- dependency-name: lograge
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>

commit | commitdiff | tree

Claire [Thu, 7 Apr 2022 18:46:30 +0000 (20:46 +0200)]

Fix migration error handling (#17991)

commit | commitdiff | tree

Claire [Thu, 7 Apr 2022 18:17:49 +0000 (20:17 +0200)]

Fix error re-running some migrations if they get interrupted at the wrong moment (#17989)

commit | commitdiff | tree

Eugen Rochko [Thu, 7 Apr 2022 16:06:15 +0000 (18:06 +0200)]

Fix pagination header on empty trends responses in REST API (#17986)

commit | commitdiff | tree

Claire [Thu, 7 Apr 2022 14:08:17 +0000 (16:08 +0200)]

Fix potentially missing statuses when reconnecting to websocket (#17981)

* Fix potentially missing statuses when reconnecting to websocket

* Add gap on reconnect rather than maintaining it constantly

commit | commitdiff | tree

Claire [Thu, 7 Apr 2022 13:25:53 +0000 (15:25 +0200)]

Merge pull request #1736 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

commit | commitdiff | tree

Claire [Thu, 7 Apr 2022 09:27:35 +0000 (11:27 +0200)]

[Glitch] Fix older items possibly disappearing on timeline updates

Port 1b91359a4508b3068207ef4fd798a56549575591 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

commit | commitdiff | tree

Claire [Thu, 7 Apr 2022 13:03:54 +0000 (15:03 +0200)]

Merge branch 'main' into glitch-soc/merge-upstream

commit | commitdiff | tree

Claire [Thu, 7 Apr 2022 13:03:31 +0000 (15:03 +0200)]

Merge pull request #1734 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

commit | commitdiff | tree

Claire [Thu, 7 Apr 2022 12:47:30 +0000 (14:47 +0200)]

Fix failure when sending warning emails with custom text (#17983)

* Add tests

* Fix failure when sending warning emails with custom text

commit | commitdiff | tree

Eugen Rochko [Thu, 7 Apr 2022 11:32:12 +0000 (13:32 +0200)]

Fix unset `SMTP_RETURN_PATH` environment variable causing e-mail not to send (#17982)

commit | commitdiff | tree

Claire [Thu, 7 Apr 2022 09:27:35 +0000 (11:27 +0200)]

Fix older items possibly disappearing on timeline updates (#17980)

In some rare cases, when receiving statuses out of order from the streaming
API then polling from the REST API, it was possible for the
`expandNormalizedTimeline` function to remove older items from the timeline.

This commit ensures that any item from the replaced slice that is older
than the oldest item retrieved from the API gets added back to the replaced
slice.

commit | commitdiff | tree

Eugen Rochko [Wed, 6 Apr 2022 20:53:29 +0000 (22:53 +0200)]

Add pagination for trending statuses in web UI (#17976)

commit | commitdiff | tree

Claire [Wed, 6 Apr 2022 19:01:41 +0000 (21:01 +0200)]

[Glitch] Fix possible duplicate statuses in timelines in some edge cases

Port dd4c156f33a24b8bb89b45b2697aa4036c3ae5be to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

commit | commitdiff | tree

Claire [Wed, 6 Apr 2022 19:10:23 +0000 (21:10 +0200)]

Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Upstream removed this file, while glitch-soc had changes to deal with
  its theming system.
  Removed the file like upstream did.

commit | commitdiff | tree

Claire [Wed, 6 Apr 2022 19:01:41 +0000 (21:01 +0200)]

Fix possible duplicate statuses in timelines in some edge cases (#17971)

In some rare cases, when receiving statuses out of order from the streaming
API then polling from the REST API, it was possible for the
`expandNormalizedTimeline` function to insert duplicates in the timeline,
which would then result in several bugs.

This commits ensures that there are no duplicates inserted in the
timeline.

commit | commitdiff | tree

Claire [Wed, 6 Apr 2022 19:01:02 +0000 (21:01 +0200)]

Fix spurious edits and require incoming edits to be explicitly marked as such (#17918)

* Change post text edit to not be considered significant if it's identical after reformatting

* We don't need to clear previous change information anymore

* Require status edits to be explicit, except for poll tallies

* Fix tests

* Add some tests

* Add poll-related tests

* Add HTML-formatting related tests

commit | commitdiff | tree

Claire [Wed, 6 Apr 2022 18:58:23 +0000 (20:58 +0200)]

Fix error when encountering invalid pinned posts (#17964)

commit | commitdiff | tree

Eugen Rochko [Wed, 6 Apr 2022 18:58:12 +0000 (20:58 +0200)]

Remove sign-in token authentication, instead send e-mail about new sign-in (#17970)

commit | commitdiff | tree

Claire [Wed, 6 Apr 2022 18:57:52 +0000 (20:57 +0200)]

Fix inconsistency in error handling when removing a status (#17974)

Not completely sure this could actually have any ill effect, but if
`RemoveStatusService` fails to acquire a lock in an
`ActivityPub::ProcessingWorker` job processing a `Delete`, the status
is currently discarded and causes a job failure but the next time the
job is attempted, it will skip deleting the status due to it being
discarded.

This commit makes the behavior of `RemoveStatusService` a bit more consistent
in case of failure to acquire the lock.

commit | commitdiff | tree

Claire [Wed, 6 Apr 2022 18:57:18 +0000 (20:57 +0200)]

Fix admin API unconditionally requiring CSRF token (#17975)

Fixes #17898

Since #17204, the admin API has only been available through the web
application because of the unconditional requirement to provide a valid CSRF
token.

This commit changes it back to `null_session`, which should make it work
both with session-based authentication (provided a CSRF token) and with a
bearer token.

commit | commitdiff | tree

Eugen Rochko [Wed, 6 Apr 2022 18:56:57 +0000 (20:56 +0200)]

Fix `GET /api/v1/trends/tags` missing `offset` param in REST API (#17973)

commit | commitdiff | tree

Claire [Wed, 6 Apr 2022 15:13:26 +0000 (17:13 +0200)]

Merge pull request #1733 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

commit | commitdiff | tree

CommanderRoot [Mon, 4 Apr 2022 16:19:45 +0000 (18:19 +0200)]

[Glitch] Replace deprecated String.prototype.substr()

Port 0ec695e036dab45d57598f451266bd0b176df9fd to glitch-soc

Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>

commit | commitdiff | tree

Claire [Wed, 6 Apr 2022 14:06:15 +0000 (16:06 +0200)]

Merge branch 'main' into glitch-soc/merge-upstream

commit | commitdiff | tree

dependabot[bot] [Tue, 5 Apr 2022 18:03:45 +0000 (03:03 +0900)]

Bump sass from 1.49.9 to 1.49.11 (#17959)

Bumps [sass](https://github.com/sass/dart-sass) from 1.49.9 to 1.49.11.
- [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.9...1.49.11)

---
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>

commit | commitdiff | tree

dependabot[bot] [Tue, 5 Apr 2022 18:03:26 +0000 (03:03 +0900)]

Bump prettier from 2.6.1 to 2.6.2 (#17958)

Bumps [prettier](https://github.com/prettier/prettier) from 2.6.1 to 2.6.2.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.6.1...2.6.2)

---
updated-dependencies:
- dependency-name: prettier
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>

commit | commitdiff | tree

dependabot[bot] [Tue, 5 Apr 2022 18:03:13 +0000 (03:03 +0900)]

Bump redis from 4.0.4 to 4.0.6 (#17957)

Bumps [redis](https://github.com/redis/node-redis) from 4.0.4 to 4.0.6.
- [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.4...redis@4.0.6)

---
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>

commit | commitdiff | tree

dependabot[bot] [Tue, 5 Apr 2022 18:02:51 +0000 (03:02 +0900)]

Bump sidekiq-unique-jobs from 7.1.15 to 7.1.16 (#17956)

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

---
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>

commit | commitdiff | tree

dependabot[bot] [Tue, 5 Apr 2022 18:02:35 +0000 (03:02 +0900)]

Bump react-redux from 7.2.6 to 7.2.8 (#17955)

Bumps [react-redux](https://github.com/reduxjs/react-redux) from 7.2.6 to 7.2.8.
- [Release notes](https://github.com/reduxjs/react-redux/releases)
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/react-redux/compare/v7.2.6...v7.2.8)

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

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

commit | commitdiff | tree

dependabot[bot] [Tue, 5 Apr 2022 18:02:07 +0000 (03:02 +0900)]

Bump ox from 2.14.10 to 2.14.11 (#17954)

Bumps [ox](https://github.com/ohler55/ox) from 2.14.10 to 2.14.11.
- [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.10...v2.14.11)

---
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>

commit | commitdiff | tree

dependabot[bot] [Tue, 5 Apr 2022 18:01:48 +0000 (03:01 +0900)]

Bump pg from 1.3.4 to 1.3.5 (#17953)

Bumps [pg](https://github.com/ged/ruby-pg) from 1.3.4 to 1.3.5.
- [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/commits)

---
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>

commit | commitdiff | tree

rinsuki [Tue, 5 Apr 2022 10:00:31 +0000 (19:00 +0900)]

fix: returns nil instead of empty URL on status.application.website (#17962)

commit | commitdiff | tree

Claire [Tue, 5 Apr 2022 07:44:09 +0000 (09:44 +0200)]

Merge pull request #1732 from OrichalcumCosmonaut/main

fix typo in `<sub>` CSS styles

commit | commitdiff | tree

quinn [Tue, 5 Apr 2022 07:35:50 +0000 (17:35 +1000)]

Update composer.scss

commit | commitdiff | tree

quinn [Tue, 5 Apr 2022 07:17:00 +0000 (17:17 +1000)]

Update status.scss

commit | commitdiff | tree

quinn [Tue, 5 Apr 2022 07:16:21 +0000 (17:16 +1000)]

Update composer.scss

commit | commitdiff | tree

Claire [Mon, 4 Apr 2022 16:42:43 +0000 (18:42 +0200)]

Merge pull request #1731 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

commit | commitdiff | tree

CommanderRoot [Mon, 4 Apr 2022 16:19:45 +0000 (18:19 +0200)]

Replace deprecated String.prototype.substr() (#17949)

* Replace deprecated String.prototype.substr()

.substr() is deprecated so we replace it with .slice() which works similarily but isn't deprecated

* Change String.prototype.substring() to String.prototype.slice()

.substring() and .slice() work very similary but .slice() is a bit faster and stricter

* Add ESLint rule to forbid usage of .substr and .substring

.substr() is deprecated and .substring() is very similar to .slice() so better to use .slice() at all times

Signed-off-by: Tobias Speicher <rootcommander@gmail.com>

commit | commitdiff | tree

Claire [Mon, 4 Apr 2022 15:25:57 +0000 (17:25 +0200)]

Merge branch 'main' into glitch-soc/merge-upstream

commit | commitdiff | tree

kibigo! [Sun, 3 Apr 2022 19:43:27 +0000 (12:43 -0700)]

Merge pull request #35 from kibicat/merge_glitch-soc_2022-03-30

Merge glitch-soc as of 2022-03-30, to integrate Mastodon 3.5.0

commit | commitdiff | tree

Ondřej Pokorný [Sun, 3 Apr 2022 12:02:29 +0000 (14:02 +0200)]

Update en.yml (#17942)

typo

commit | commitdiff | tree

single-right-quote [Sat, 2 Apr 2022 18:48:52 +0000 (18:48 +0000)]

Merge branch 'main' of https://github.com/glitch-soc/mastodon into merge_glitch-soc_2022-03-30

commit | commitdiff | tree

Claire [Fri, 1 Apr 2022 21:59:13 +0000 (23:59 +0200)]

Fix unusual number formatting in some locales (#17929)

* Fix unusual number formatting in some locales

Fixes #17904

* Fix typo

commit | commitdiff | tree

Holger [Fri, 1 Apr 2022 21:56:23 +0000 (05:56 +0800)]

fix: `s3_force_single_request` not parsed (#17922)

commit | commitdiff | tree

Claire [Fri, 1 Apr 2022 21:55:32 +0000 (23:55 +0200)]

Fix assets failing to build with OpenSSL 3 because of deprecated hash algorithm (#17930)

Fixes #17924

commit | commitdiff | tree

dependabot[bot] [Thu, 31 Mar 2022 10:10:40 +0000 (19:10 +0900)]

Bump puma from 5.6.2 to 5.6.4 (#17914)

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

---
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>

commit | commitdiff | tree

Holger [Thu, 31 Mar 2022 09:20:26 +0000 (17:20 +0800)]

fix: PWA web manifest not changed to new routes (#17921)

commit | commitdiff | tree

Claire [Thu, 31 Mar 2022 08:42:51 +0000 (10:42 +0200)]

Merge pull request #1729 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

commit | commitdiff | tree

Claire [Thu, 31 Mar 2022 08:36:23 +0000 (10:36 +0200)]

Merge branch 'main' into glitch-soc/merge-upstream

commit | commitdiff | tree

Claire [Wed, 30 Mar 2022 22:49:24 +0000 (00:49 +0200)]

Fix error MethodError in Chewy::Strategy::Sidekiq::Worker (#17912)

Also refactor a bit to reduce code duplication.

commit | commitdiff | tree

single-right-quote [Wed, 30 Mar 2022 17:59:41 +0000 (17:59 +0000)]

Merge branch 'main' of https://github.com/glitch-soc/mastodon into merge_glitch-soc_2022-03-30

commit | commitdiff | tree

Claire [Wed, 30 Mar 2022 16:28:07 +0000 (18:28 +0200)]

Merge pull request #1726 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

commit | commitdiff | tree

single-right-quote [Wed, 30 Mar 2022 16:06:00 +0000 (16:06 +0000)]

Merge remote-tracking branch 'origin/main' into merge_glitch-soc_2022-03-30

source code fur Kibicat Mastodon