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

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

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

Update en.yml (#17942)

typo

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

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

Claire [Wed, 30 Mar 2022 13:02:56 +0000 (15:02 +0200)]

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

commit | commitdiff | tree

Claire [Wed, 30 Mar 2022 13:02:16 +0000 (15:02 +0200)]

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

Merge upstream changes

commit | commitdiff | tree

Eugen Rochko [Wed, 30 Mar 2022 12:52:37 +0000 (14:52 +0200)]

Bump version to 3.5.0 (#17911)

commit | commitdiff | tree

Eugen Rochko [Wed, 30 Mar 2022 12:46:03 +0000 (14:46 +0200)]

Fix being able to post URLs longer than 4096 characters (#17908)

commit | commitdiff | tree

Eugen Rochko [Wed, 30 Mar 2022 12:45:52 +0000 (14:45 +0200)]

Fix being able to bypass e-mail restrictions (#17909)

commit | commitdiff | tree

Eugen Rochko [Wed, 30 Mar 2022 12:34:53 +0000 (14:34 +0200)]

Revert "Split build image actions (#17793)" (#17907)

This reverts commit 22eeaf2645e44ea800a6e4c4acb7bf9d72211344.

commit | commitdiff | tree

Claire [Wed, 30 Mar 2022 11:40:10 +0000 (13:40 +0200)]

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

commit | commitdiff | tree

Claire [Wed, 30 Mar 2022 08:26:51 +0000 (10:26 +0200)]

Refactor `response_to_recipient?` CTE (#17899)

* Optimize and clean up `response_to_recipient?` CTE

Marginally improve performances, and make the CTE much more readable

* Limit max depth in `response_to_recipient?` CTE

commit | commitdiff | tree

Claire [Tue, 29 Mar 2022 20:55:37 +0000 (22:55 +0200)]

Fix regression of status colors in actions modal in web UI (#17903)

Fixes #17900

Regression in #17844 (#17851 restored the code in the wrong place…)

commit | commitdiff | tree

Yurii Izorkin [Tue, 29 Mar 2022 20:16:59 +0000 (23:16 +0300)]

caniuse-lite: add hash sum (#17902)

commit | commitdiff | tree

Claire [Tue, 29 Mar 2022 14:39:43 +0000 (16:39 +0200)]

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

Merge upstream changes

commit | commitdiff | tree

dependabot[bot] [Tue, 29 Mar 2022 09:58:28 +0000 (18:58 +0900)]

Bump rubocop from 1.26.0 to 1.26.1 (#17891)

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.26.0 to 1.26.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.26.0...v1.26.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>

commit | commitdiff | tree

dependabot[bot] [Tue, 29 Mar 2022 09:49:00 +0000 (18:49 +0900)]

Bump capistrano from 3.16.0 to 3.17.0 (#17774)

* Bump capistrano from 3.16.0 to 3.17.0

Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.16.0 to 3.17.0.
- [Release notes](https://github.com/capistrano/capistrano/releases)
- [Commits](https://github.com/capistrano/capistrano/compare/v3.16.0...v3.17.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
* 3.17.0

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

commit | commitdiff | tree

dependabot[bot] [Tue, 29 Mar 2022 08:53:21 +0000 (17:53 +0900)]

Bump concurrent-ruby from 1.1.9 to 1.1.10 (#17889)

Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby) from 1.1.9 to 1.1.10.
- [Release notes](https://github.com/ruby-concurrency/concurrent-ruby/releases)
- [Changelog](https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ruby-concurrency/concurrent-ruby/compare/v1.1.9...v1.1.10)

---
updated-dependencies:
- dependency-name: concurrent-ruby
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, 29 Mar 2022 08:52:52 +0000 (17:52 +0900)]

Bump babel-loader from 8.2.3 to 8.2.4 (#17894)

Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.2.3 to 8.2.4.
- [Release notes](https://github.com/babel/babel-loader/releases)
- [Changelog](https://github.com/babel/babel-loader/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel-loader/compare/v8.2.3...v8.2.4)

---
updated-dependencies:
- dependency-name: babel-loader
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, 29 Mar 2022 08:52:24 +0000 (17:52 +0900)]

Bump @testing-library/jest-dom from 5.16.2 to 5.16.3 (#17895)

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

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

commit | commitdiff | tree

dependabot[bot] [Tue, 29 Mar 2022 08:51:55 +0000 (17:51 +0900)]

Bump prettier from 2.6.0 to 2.6.1 (#17893)

Bumps [prettier](https://github.com/prettier/prettier) from 2.6.0 to 2.6.1.
- [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.0...2.6.1)

---
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, 29 Mar 2022 08:51:13 +0000 (17:51 +0900)]

Bump devise-two-factor from 4.0.1 to 4.0.2 (#17892)

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

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

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

commit | commitdiff | tree

dependabot[bot] [Tue, 29 Mar 2022 08:50:40 +0000 (17:50 +0900)]

Bump yargs from 17.3.1 to 17.4.0 (#17834)

Bumps [yargs](https://github.com/yargs/yargs) from 17.3.1 to 17.4.0.
- [Release notes](https://github.com/yargs/yargs/releases)
- [Changelog](https://github.com/yargs/yargs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/yargs/yargs/compare/v17.3.1...v17.4.0)

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

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

commit | commitdiff | tree

Eugen Rochko [Tue, 29 Mar 2022 01:51:09 +0000 (03:51 +0200)]

New Crowdin updates (#17864)

* New translations doorkeeper.en.yml (Kazakh)

* New translations doorkeeper.en.yml (Estonian)

* New translations doorkeeper.en.yml (Latvian)

* New translations doorkeeper.en.yml (Hindi)

* New translations doorkeeper.en.yml (Welsh)

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

* New translations doorkeeper.en.yml (Esperanto)

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

* New translations doorkeeper.en.yml (Tatar)

* New translations doorkeeper.en.yml (Malayalam)

* New translations doorkeeper.en.yml (Breton)

* New translations doorkeeper.en.yml (Sinhala)

* New translations doorkeeper.en.yml (Occitan)

* New translations activerecord.en.yml (Czech)

* New translations devise.en.yml (Polish)

* New translations activerecord.en.yml (Dutch)

* New translations devise.en.yml (Dutch)

* New translations activerecord.en.yml (Norwegian)

* New translations devise.en.yml (Norwegian)

* New translations activerecord.en.yml (Polish)

* New translations activerecord.en.yml (Portuguese)

* New translations devise.en.yml (Portuguese)

* New translations activerecord.en.yml (Russian)

* New translations devise.en.yml (Russian)

* New translations activerecord.en.yml (Slovak)

* New translations devise.en.yml (Slovak)

* New translations activerecord.en.yml (Slovenian)

* New translations devise.en.yml (Slovenian)

* New translations activerecord.en.yml (Albanian)

* New translations devise.en.yml (Albanian)

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

* New translations devise.en.yml (Korean)

* New translations devise.en.yml (Czech)

* New translations activerecord.en.yml (Hebrew)

* New translations activerecord.en.yml (Danish)

* New translations devise.en.yml (Danish)

* New translations activerecord.en.yml (German)

* New translations devise.en.yml (German)

* New translations activerecord.en.yml (Greek)

* New translations devise.en.yml (Greek)

* New translations activerecord.en.yml (Basque)

* New translations devise.en.yml (Basque)

* New translations activerecord.en.yml (Finnish)

* New translations devise.en.yml (Finnish)

* New translations devise.en.yml (Hebrew)

* New translations activerecord.en.yml (Korean)

* New translations activerecord.en.yml (Hungarian)

* New translations devise.en.yml (Hungarian)

* New translations activerecord.en.yml (Armenian)

* New translations devise.en.yml (Armenian)

* New translations activerecord.en.yml (Italian)

* New translations devise.en.yml (Italian)

* New translations activerecord.en.yml (Japanese)

* New translations devise.en.yml (Japanese)

* New translations activerecord.en.yml (Georgian)

* New translations devise.en.yml (Georgian)

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

* New translations activerecord.en.yml (Swedish)

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

* New translations activerecord.en.yml (Bengali)

* New translations devise.en.yml (Bengali)

* New translations activerecord.en.yml (Marathi)

* New translations activerecord.en.yml (Thai)

* New translations activerecord.en.yml (Croatian)

* New translations devise.en.yml (Croatian)

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

* New translations activerecord.en.yml (Kazakh)

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

* New translations devise.en.yml (Kazakh)

* New translations activerecord.en.yml (Estonian)

* New translations devise.en.yml (Estonian)

* New translations activerecord.en.yml (Latvian)

* New translations devise.en.yml (Latvian)

* New translations activerecord.en.yml (Hindi)

* New translations devise.en.yml (Hindi)

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

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

* New translations devise.en.yml (Swedish)

* New translations activerecord.en.yml (Vietnamese)

* New translations activerecord.en.yml (Turkish)

* New translations devise.en.yml (Turkish)

* New translations activerecord.en.yml (Ukrainian)

* New translations devise.en.yml (Ukrainian)

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

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

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

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

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

* New translations devise.en.yml (Vietnamese)

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

* New translations activerecord.en.yml (Galician)

* New translations devise.en.yml (Galician)

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

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

* New translations activerecord.en.yml (Indonesian)

* New translations devise.en.yml (Indonesian)

* New translations activerecord.en.yml (Persian)

* New translations devise.en.yml (Persian)

* New translations activerecord.en.yml (Tamil)

* New translations devise.en.yml (Tamil)

* New translations devise.en.yml (Welsh)

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

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

* New translations activerecord.en.yml (Corsican)

* New translations devise.en.yml (Corsican)

* New translations activerecord.en.yml (Sardinian)

* New translations devise.en.yml (Sardinian)

* New translations activerecord.en.yml (Kabyle)

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

* New translations devise.en.yml (Kabyle)

* New translations devise.en.yml (Ido)

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

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

* New translations activerecord.en.yml (Esperanto)

* New translations activerecord.en.yml (Breton)

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

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

* New translations activerecord.en.yml (Tatar)

* New translations devise.en.yml (Tatar)

* New translations activerecord.en.yml (Malayalam)

* New translations devise.en.yml (Malayalam)

* New translations devise.en.yml (Breton)

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

* New translations activerecord.en.yml (Sinhala)

* New translations devise.en.yml (Sinhala)

* New translations devise.en.yml (Kannada)

* New translations activerecord.en.yml (Occitan)

* New translations devise.en.yml (Occitan)

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

* New translations en.json (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.json (Portuguese, Brazilian)

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

* New translations en.json (Portuguese, Brazilian)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Danish)

* New translations en.yml (Vietnamese)

* New translations en.yml (Galician)

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

* New translations en.yml (Albanian)

* New translations en.json (Albanian)

* New translations en.json (Albanian)

* New translations en.yml (Scottish Gaelic)

* New translations en.json (Scottish Gaelic)

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

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

* New translations en.yml (Icelandic)

* New translations en.yml (Spanish)

* New translations en.yml (Polish)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.json (French)

* New translations en.yml (Portuguese)

* New translations en.yml (Italian)

* New translations en.yml (Ukrainian)

* New translations en.json (Ukrainian)

* New translations doorkeeper.en.yml (Ukrainian)

* New translations en.json (Ukrainian)

* New translations en.yml (Indonesian)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Czech)

* New translations en.yml (Czech)

* New translations en.json (Czech)

* New translations en.json (Czech)

* New translations en.yml (Czech)

* New translations en.yml (Thai)

* New translations en.yml (Czech)

* New translations en.json (Czech)

* New translations en.yml (Czech)

* New translations en.json (Czech)

* New translations en.json (Czech)

* New translations en.json (Czech)

* New translations simple_form.en.yml (Czech)

* New translations en.yml (Czech)

* New translations en.json (Czech)

* New translations en.json (Czech)

* New translations en.json (Czech)

* New translations en.json (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 (Korean)

* New translations en.yml (Portuguese)

* New translations en.yml (Hungarian)

* 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 (Indonesian)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Finnish)

* New translations en.yml (Galician)

* 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 (Hebrew)

* New translations en.yml (Italian)

* New translations en.yml (Japanese)

* New translations en.yml (Russian)

* 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 (Danish)

* New translations en.yml (Spanish, Mexico)

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

* New translations en.yml (Latvian)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Catalan)

* New translations en.yml (Korean)

* New translations en.yml (Danish)

* New translations en.yml (Danish)

* New translations en.yml (Spanish)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (Hungarian)

* New translations en.yml (Icelandic)

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

* New translations en.yml (Czech)

* New translations en.yml (Albanian)

* New translations en.yml (Russian)

* New translations en.yml (Russian)

* New translations en.yml (Russian)

* New translations en.json (Persian)

* New translations en.yml (Persian)

* New translations simple_form.en.yml (Persian)

* New translations doorkeeper.en.yml (Persian)

* New translations en.yml (Indonesian)

* New translations en.json (Persian)

* New translations en.yml (Persian)

* New translations simple_form.en.yml (Persian)

* New translations doorkeeper.en.yml (Persian)

* New translations en.yml (Italian)

* 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

Claire [Mon, 28 Mar 2022 21:57:38 +0000 (23:57 +0200)]

Fix /api/v1/admin/accounts (#17887)

* Fix /api/v1/admin/accounts

Compatibility was broken since #17009 which changed the underlying filter class
without changing the controller.

This commits restore support for the old parameters.

* Add /api/v2/admin/accounts with the new parameters

* Add tests

* Add missing filter for `silenced` status

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>

commit | commitdiff | tree

Claire [Mon, 28 Mar 2022 21:40:45 +0000 (23:40 +0200)]

Fix code blocks processing

commit | commitdiff | tree

Shlee [Mon, 28 Mar 2022 21:38:20 +0000 (08:08 +1030)]

Split build image actions (#17793)

* Update build-image.yml

* Update build-image.yml

* Update build-image.yml

* Update build-image.yml

commit | commitdiff | tree

Claire [Mon, 28 Mar 2022 18:51:51 +0000 (20:51 +0200)]

Add advanced text formatting back into glitch-soc

commit | commitdiff | tree

Claire [Mon, 28 Mar 2022 14:22:28 +0000 (16:22 +0200)]

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

commit | commitdiff | tree

Claire [Mon, 28 Mar 2022 10:43:58 +0000 (12:43 +0200)]

Fix test-related issues (#17888)

* Remove obsolete RSS::Serializer test

Since #17828, RSS::Serializer no longer has specific code for deleted statuses,
but it is never called on deleted statuses anyway.

* Rename erroneously-named test files

* Fix failing test

* Fix test deprecation warnings

* Update CircleCI Ruby orb

1.4.0 has a bug that does not match all the test files due to incorrect
globbing

commit | commitdiff | tree

Eugen Rochko [Mon, 28 Mar 2022 07:39:31 +0000 (09:39 +0200)]

Add `SMTP_RETURN_PATH` environment variable to set bounce domain (#17886)

commit | commitdiff | tree

Claire [Sun, 27 Mar 2022 23:17:17 +0000 (01:17 +0200)]

Refactor account and status formatting (#17877)

* Refactor status formatting

* Add account formatting helpers

* Remove StatusFormatter

* Fixup

* Fix copied typo

commit | commitdiff | tree

Claire [Sun, 27 Mar 2022 23:16:02 +0000 (01:16 +0200)]

Fix extra “zero” key in some plural translation strings (#17883)

commit | commitdiff | tree

mayaeh [Sat, 26 Mar 2022 01:52:51 +0000 (10:52 +0900)]

[Glitch] Add a hashtag public link to the trending hashtag page

Port 52813830bee5607332b49bee2916956286ec5dc1 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>

commit | commitdiff | tree

Claire [Sat, 26 Mar 2022 18:18:55 +0000 (19:18 +0100)]

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

Conflicts:
- `app/lib/formatter.rb`:
  Upstream completely refactored the formatting code and removed that file,
  while glitch-soc had code for Markdown and HTML toots.
  Took upstream code, glitch-soc changes will be re-implemented on top of the
  refactored classes in a later commit.
- `app/models/status.rb`:
  Upstream refactored status edit handling and moved code to
  `app/models/concerns/status_snapshot_concern.rb`.
  Applied glitch-soc's changes to that file.
- `app/serializers/activitypub/note_serializer.rb`:
  Not really a conflict, just a line added too close to one modified by
  glitch-soc.
  Applied upstream changes while keeping the glitch-soc-modified one.
- `app/services/update_status_service.rb`:
  Not really a conflict, upstream modified a line adjacent to one added by
  glitch-soc.
  Applied upstream changes while keeping the glitch-soc line.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream refactored formatting, glitch-soc changed the markup slightly.
  Applied upstream changes.
- `spec/lib/formatter_spec.rb`:
  Upstream completely refactored the formatting code and removed that file,
  while glitch-soc had code for Markdown and HTML toots.
  Took upstream code, glitch-soc changes will be re-implemented on top of the
  refactored classes in a later commit.

commit | commitdiff | tree

Eugen Rochko [Sat, 26 Mar 2022 03:29:36 +0000 (04:29 +0100)]

Bump version to 3.5.0rc3 (#17876)

commit | commitdiff | tree

Eugen Rochko [Sat, 26 Mar 2022 03:02:19 +0000 (04:02 +0100)]

Fix typo (#17875)

commit | commitdiff | tree

Eugen Rochko [Sat, 26 Mar 2022 01:54:11 +0000 (02:54 +0100)]

Bump version to 3.5.0rc2 (#17855)

commit | commitdiff | tree

Eugen Rochko [Sat, 26 Mar 2022 01:53:34 +0000 (02:53 +0100)]

Refactor formatter (#17828)

* Refactor formatter

* Move custom emoji pre-rendering logic to view helpers

* Move more methods out of Formatter

* Fix code style issues

* Remove Formatter

* Add inline poll options to RSS feeds

* Remove unused helper method

* Fix code style issues

* Various fixes and improvements

* Fix test

commit | commitdiff | tree

Eugen Rochko [Sat, 26 Mar 2022 01:53:13 +0000 (02:53 +0100)]

Change how unconfirmed accounts are displayed in admin UI (#17874)

Fix #17815

commit | commitdiff | tree

mayaeh [Sat, 26 Mar 2022 01:52:51 +0000 (10:52 +0900)]

Add a hashtag public link to the trending hashtag page (#17140)

* Add a hashtag public link to the hashtag management page

* Add support for element 'target' to Counter.js.
Remove 'rel' element.

* Update app/javascript/mastodon/components/admin/Counter.js

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>

commit | commitdiff | tree

Jeong Arm [Fri, 25 Mar 2022 23:39:54 +0000 (08:39 +0900)]

Add stop delivery link also for failing instance (#17871)

commit | commitdiff | tree

Eugen Rochko [Fri, 25 Mar 2022 23:38:44 +0000 (00:38 +0100)]

Fix edits with no actual changes being allowed (#17843)

* Fix edits with no actual changes being allowed locally

* Fix edits with no actual changes being allowed through ActivityPub

* Fix false positive changes caused by description processing in model

* Fix not recording poll expiration update

* Fix test

* Revert changes to ProcessStatusUpdateService

* Various fixes and improvements

* Fix code style issues

* Various changes and improvements

* Add guard clause

source code fur Kibicat Mastodon