]> cat aescling's git repositories - mastodon.git/log
mastodon.git
4 years agoMerge pull request #1567 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Tue, 13 Jul 2021 21:55:09 +0000 (23:55 +0200)]
Merge pull request #1567 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Tue, 13 Jul 2021 15:57:15 +0000 (17:57 +0200)]
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `CONTRIBUTING.md`:
  Upstream file has changed and we're quoting it.
  Ported the changes.
- `README.md`:
  Upstream file has changed but we have a completely different one.
  Kept our version.
- `lib/mastodon/version.rb`:
  Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
  but we're still `glitch-soc/mastodon`.
  Kept our version.
- `spec/presenters/instance_presenter_spec.rb`:
  Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
  but we're still `glitch-soc/mastodon`.
  Kept our version.

4 years agoUpdate CodeClimate badge in README (#16501)
Eugen Rochko [Tue, 13 Jul 2021 14:02:15 +0000 (16:02 +0200)]
Update CodeClimate badge in README (#16501)

4 years agoChange references to tootsuite/mastodon to mastodon/mastodon (#16491)
Claire [Tue, 13 Jul 2021 13:46:20 +0000 (15:46 +0200)]
Change references to tootsuite/mastodon to mastodon/mastodon (#16491)

* Change references to tootsuite/mastodon to mastodon/mastodon

* Remove obsolete test fixture

* Replace occurrences of tootsuite/mastodon with mastodon/mastodon in CHANGELOG

And a few other places

4 years agoMerge pull request #1566 from ClearlyClaire/glitch-soc/feature/modal-stack
Claire [Tue, 13 Jul 2021 13:45:21 +0000 (15:45 +0200)]
Merge pull request #1566 from ClearlyClaire/glitch-soc/feature/modal-stack

Fix boost/fav confirmation modals closing media modal

4 years agoImprove modal flow and back button handling (#16499)
Claire [Tue, 13 Jul 2021 13:45:17 +0000 (15:45 +0200)]
Improve modal flow and back button handling (#16499)

* Refactor shouldUpdateScroll passing

So far, shouldUpdateScroll has been manually passed down from the very top of
the React component hierarchy even though it is a static function common to
all ScrollContainer instances, so replaced that with a custom class extending
ScrollContainer.

* Generalize “press back to close modal” to any modal and to public pages

* Fix boost confirmation modal closing media modal

4 years agoPlease CodeClimate
Claire [Tue, 13 Jul 2021 11:49:40 +0000 (13:49 +0200)]
Please CodeClimate

4 years agoSmall scroll/history behavior fixup to take weird browser patterns into account
Claire [Tue, 13 Jul 2021 10:57:07 +0000 (12:57 +0200)]
Small scroll/history behavior fixup to take weird browser patterns into account

4 years agoRefactor shouldUpdateScroll stuff
Claire [Tue, 13 Jul 2021 10:40:15 +0000 (12:40 +0200)]
Refactor shouldUpdateScroll stuff

4 years agoFix scroll handling with modals
Claire [Tue, 13 Jul 2021 09:07:16 +0000 (11:07 +0200)]
Fix scroll handling with modals

4 years agoFix and simplify browser history handling in relation to modals
Claire [Mon, 12 Jul 2021 15:55:40 +0000 (17:55 +0200)]
Fix and simplify browser history handling in relation to modals

This simplifies the logic to:
- when the last modal gets closed and we're in our history buffer state, go back
- whenever a modal is open, ensure we're in a history buffer state by
  potentially pushing one

4 years agoAdd modal stack to allow better boost modal and media modal interaction.
Claire [Mon, 12 Jul 2021 15:00:14 +0000 (17:00 +0200)]
Add modal stack to allow better boost modal and media modal interaction.

4 years agoFix clicking on the pop-up player placeholder expanding the clicked toot
Claire [Mon, 12 Jul 2021 12:44:35 +0000 (14:44 +0200)]
Fix clicking on the pop-up player placeholder expanding the clicked toot

4 years agoFix follow suggestions scrolling on mobile view
Claire [Mon, 12 Jul 2021 06:07:04 +0000 (08:07 +0200)]
Fix follow suggestions scrolling on mobile view

Also simplify the CSS a bit and bring it closer to upstream.

4 years agoMerge pull request #1563 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Sun, 11 Jul 2021 20:38:06 +0000 (22:38 +0200)]
Merge pull request #1563 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Sun, 11 Jul 2021 19:41:23 +0000 (21:41 +0200)]
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/serializers/rest/instance_serializer.rb`:
  Upstream changed the fields returned by /api/v1/instance by adding a
  `configuration` field holding a lot of useful information making our
  `max_toot_chars` and `poll_limits` fields obsolete.
  Keeping those around for now for compatibility.
- `app/validators/status_length_validator.rb`:
  No real conflict, just URL_PLACEHOLDER_CHARS introduced too close to
  MAX_CHARS which is defined differently in glitch-soc.
  Ported upstream changes.

4 years agoUpdate docker-compose.yml (#16489)
Shlee [Sun, 11 Jul 2021 10:57:31 +0000 (18:57 +0800)]
Update docker-compose.yml (#16489)

4 years agoAdd ability to filter reports by origin of target account (#16487)
Eugen Rochko [Sun, 11 Jul 2021 09:01:38 +0000 (11:01 +0200)]
Add ability to filter reports by origin of target account (#16487)

4 years agoBump rubocop from 1.18.2 to 1.18.3 (#16477)
dependabot[bot] [Sat, 10 Jul 2021 16:08:54 +0000 (01:08 +0900)]
Bump rubocop from 1.18.2 to 1.18.3 (#16477)

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.18.2 to 1.18.3.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.18.2...v1.18.3)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump sass from 1.35.1 to 1.35.2 (#16478)
dependabot[bot] [Sat, 10 Jul 2021 16:08:40 +0000 (01:08 +0900)]
Bump sass from 1.35.1 to 1.35.2 (#16478)

Bumps [sass](https://github.com/sass/dart-sass) from 1.35.1 to 1.35.2.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.35.1...1.35.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoAdd `configuration` attribute to `GET /api/v1/instance` (#16485)
Eugen Rochko [Sat, 10 Jul 2021 15:58:41 +0000 (17:58 +0200)]
Add `configuration` attribute to `GET /api/v1/instance` (#16485)

List various values like file size limits and supported mime types

4 years agoUse ruby-2.7.4 (#16481)
Daigo 3 Dango [Fri, 9 Jul 2021 23:29:27 +0000 (23:29 +0000)]
Use ruby-2.7.4 (#16481)

Stop using older version of resolv gem as the bug has been fixed.
https://bugs.ruby-lang.org/issues/17781

4 years agoMerge pull request #1562 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Thu, 8 Jul 2021 17:53:43 +0000 (19:53 +0200)]
Merge pull request #1562 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years ago[Glitch] Fix pop-in player display when poster has long username or handle
Claire [Mon, 5 Jul 2021 17:16:06 +0000 (19:16 +0200)]
[Glitch] Fix pop-in player display when poster has long username or handle

Port 1381e0e1d9f27bd108d8b9349896f10ffe996cb2 to glitch-soc

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

Conflicts:
- `app/helpers/accounts_helper.rb`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change.
- `app/views/accounts/_header.html.haml`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change.
- `app/views/directories/index.html.haml`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change.

4 years agoBump rubocop from 1.18.1 to 1.18.2 (#16470)
dependabot[bot] [Thu, 8 Jul 2021 05:37:18 +0000 (14:37 +0900)]
Bump rubocop from 1.18.1 to 1.18.2 (#16470)

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.18.1 to 1.18.2.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.18.1...v1.18.2)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump rubocop-rails from 2.11.1 to 2.11.2 (#16471)
dependabot[bot] [Thu, 8 Jul 2021 05:37:06 +0000 (14:37 +0900)]
Bump rubocop-rails from 2.11.1 to 2.11.2 (#16471)

Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.11.1 to 2.11.2.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.11.1...v2.11.2)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump sidekiq-unique-jobs from 7.1.1 to 7.1.2 (#16472)
dependabot[bot] [Thu, 8 Jul 2021 05:35:45 +0000 (14:35 +0900)]
Bump sidekiq-unique-jobs from 7.1.1 to 7.1.2 (#16472)

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

---
updated-dependencies:
- dependency-name: sidekiq-unique-jobs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump oj from 3.11.7 to 3.11.8 (#16473)
dependabot[bot] [Thu, 8 Jul 2021 05:35:34 +0000 (14:35 +0900)]
Bump oj from 3.11.7 to 3.11.8 (#16473)

Bumps [oj](https://github.com/ohler55/oj) from 3.11.7 to 3.11.8.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.11.7...v3.11.8)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump addressable from 2.7.0 to 2.8.0 (#16474)
dependabot[bot] [Thu, 8 Jul 2021 05:35:20 +0000 (14:35 +0900)]
Bump addressable from 2.7.0 to 2.8.0 (#16474)

Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.7.0 to 2.8.0.
- [Release notes](https://github.com/sporkmonger/addressable/releases)
- [Changelog](https://github.com/sporkmonger/addressable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.7.0...addressable-2.8.0)

---
updated-dependencies:
- dependency-name: addressable
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump ws from 7.5.1 to 7.5.2 (#16475)
dependabot[bot] [Thu, 8 Jul 2021 05:34:32 +0000 (14:34 +0900)]
Bump ws from 7.5.1 to 7.5.2 (#16475)

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

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoAdd ability to skip sign-in token authentication for specific users (#16427)
Eugen Rochko [Thu, 8 Jul 2021 03:31:28 +0000 (05:31 +0200)]
Add ability to skip sign-in token authentication for specific users (#16427)

Remove "active within last two weeks" exception for sign in token requirement

Change admin reset password to lock access until the password is reset

4 years agoAdd --by-uri option to `tootctl domains purge` (#16434)
Claire [Wed, 7 Jul 2021 19:17:00 +0000 (21:17 +0200)]
Add --by-uri option to `tootctl domains purge` (#16434)

Fixes #16410

4 years agoFix upgrade path from 3.4.0 (#16465)
Claire [Wed, 7 Jul 2021 19:13:30 +0000 (21:13 +0200)]
Fix upgrade path from 3.4.0 (#16465)

3.4.1 dropped account_stats.lock_version, but in a way breaking the usual
upgrade path by requiring services to be reloaded after the post-migrations.

Indeed, `self.locking_column = nil` was not enough for Rails to ignore the
`lock_version` column when preparing statements on application load, resulting
in some ActiveRecord queries (typically those involving
`includes(:account_stat)`) erroring out with:

  ActiveRecord::StatementInvalid (PG::UndefinedColumn: ERROR:  column account_stats.lock_version does not exist

4 years agoChange number_to_human calls to always use 3-digits precision (#16469)
Claire [Wed, 7 Jul 2021 19:13:08 +0000 (21:13 +0200)]
Change number_to_human calls to always use 3-digits precision (#16469)

Fixes #16435

4 years agoAdd tests for BootstrapTimelineService (#16476)
Claire [Wed, 7 Jul 2021 19:12:43 +0000 (21:12 +0200)]
Add tests for BootstrapTimelineService (#16476)

4 years agoPreload libjemalloc.so for long-running Ruby (#16462)
Akihiko Odaki [Mon, 5 Jul 2021 17:16:35 +0000 (02:16 +0900)]
Preload libjemalloc.so for long-running Ruby (#16462)

Always mark jemalloc needed if jemalloc is enabled by akihikodaki · Pull Request #4627 · ruby/ruby
https://github.com/ruby/ruby/pull/4627
> Symbols exported by jemalloc is referred by the shared library but not
> by the executables when building Ruby as a shared library with
> jemalloc. It causes shared libraries such as the GNU C++ library
> occasionally rely on the memory allocator provided by the standard C
> library. Worse, the resolved symbols can later be replaced with
> jemalloc, and jemalloc may see pointers from the standard C library,
> which results in various failures.
> e.g. https://github.com/tootsuite/mastodon/issues/15751

As a workaround, do not rely on jemalloc enablement of Ruby, and
preload libjemalloc.so instead.

4 years agoFix typo in tag_feed_spec.rb (#16466)
Ikko Ashimine [Mon, 5 Jul 2021 17:16:21 +0000 (02:16 +0900)]
Fix typo in tag_feed_spec.rb (#16466)

existant -> existent

4 years agoFix pop-in player display when poster has long username or handle (#16468)
Claire [Mon, 5 Jul 2021 17:16:06 +0000 (19:16 +0200)]
Fix pop-in player display when poster has long username or handle (#16468)

4 years agoBump eslint from 7.29.0 to 7.30.0 (#16461)
dependabot[bot] [Sun, 4 Jul 2021 02:59:37 +0000 (11:59 +0900)]
Bump eslint from 7.29.0 to 7.30.0 (#16461)

Bumps [eslint](https://github.com/eslint/eslint) from 7.29.0 to 7.30.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.29.0...v7.30.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump @rails/ujs from 6.1.3 to 6.1.4 (#16442)
dependabot[bot] [Sat, 3 Jul 2021 20:07:46 +0000 (05:07 +0900)]
Bump @rails/ujs from 6.1.3 to 6.1.4 (#16442)

Bumps [@rails/ujs](https://github.com/rails/rails) from 6.1.3 to 6.1.4.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v6.1.3...v6.1.4)

---
updated-dependencies:
- dependency-name: "@rails/ujs"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump rails from 6.1.3.2 to 6.1.4 (#16436)
dependabot[bot] [Sat, 3 Jul 2021 20:07:32 +0000 (05:07 +0900)]
Bump rails from 6.1.3.2 to 6.1.4 (#16436)

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

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoFix anonymous access to outbox not being cached by the reverse proxy (#16458)
Claire [Sat, 3 Jul 2021 19:13:47 +0000 (21:13 +0200)]
Fix anonymous access to outbox not being cached by the reverse proxy (#16458)

* Fix anonymous access to outbox not being cached by the reverse proxy

Up until now, anonymous access to outbox was marked as public, but with a
0 duration for caching, which means remote proxies would only serve from cache
when the server was completely overwhelmed.

Changed that cache duration to one minute, so that repeated anonymous access
to one account's outbox can be appropriately cached.

Also added `Signature` to the `Vary` header in case a page is requested, so
that authenticated fetches are never served from cache (which only contains
public toots).

* Remove Vary: Accept header from webfinger controller

Indeed, we have stopped returning xrd, and only ever return jrd, so the
Accept request header does not matter anymore.

* Cache negative webfinger hits for 3 minutes

4 years agoMerge pull request #1560 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Fri, 2 Jul 2021 14:57:28 +0000 (16:57 +0200)]
Merge pull request #1560 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

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

4 years agoFix not being able to suspend accounts that already have a canonical e-mail block...
Eugen Rochko [Fri, 2 Jul 2021 10:03:15 +0000 (12:03 +0200)]
Fix not being able to suspend accounts that already have a canonical e-mail block (#16455)

4 years agoBump ws from 7.5.0 to 7.5.1 (#16452)
dependabot[bot] [Wed, 30 Jun 2021 17:19:30 +0000 (02:19 +0900)]
Bump ws from 7.5.0 to 7.5.1 (#16452)

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

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump rubocop from 1.17.0 to 1.18.1 (#16451)
dependabot[bot] [Wed, 30 Jun 2021 16:59:58 +0000 (01:59 +0900)]
Bump rubocop from 1.17.0 to 1.18.1 (#16451)

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.17.0 to 1.18.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.17.0...v1.18.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump sidekiq-unique-jobs from 7.0.12 to 7.1.1 (#16450)
dependabot[bot] [Wed, 30 Jun 2021 15:45:49 +0000 (00:45 +0900)]
Bump sidekiq-unique-jobs from 7.0.12 to 7.1.1 (#16450)

Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 7.0.12 to 7.1.1.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases)
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.0.12...v7.1.1)

---
updated-dependencies:
- dependency-name: sidekiq-unique-jobs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump babel-jest from 27.0.2 to 27.0.6 (#16441)
dependabot[bot] [Wed, 30 Jun 2021 14:41:10 +0000 (23:41 +0900)]
Bump babel-jest from 27.0.2 to 27.0.6 (#16441)

Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 27.0.2 to 27.0.6.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v27.0.6/packages/babel-jest)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump rubocop-rails from 2.11.0 to 2.11.1 (#16439)
dependabot[bot] [Wed, 30 Jun 2021 14:40:07 +0000 (23:40 +0900)]
Bump rubocop-rails from 2.11.0 to 2.11.1 (#16439)

Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.11.0 to 2.11.1.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.11.0...v2.11.1)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump @babel/preset-env from 7.14.5 to 7.14.7 (#16443)
dependabot[bot] [Wed, 30 Jun 2021 14:37:32 +0000 (23:37 +0900)]
Bump @babel/preset-env from 7.14.5 to 7.14.7 (#16443)

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

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump mini-css-extract-plugin from 1.6.0 to 1.6.2 (#16444)
dependabot[bot] [Wed, 30 Jun 2021 14:37:01 +0000 (23:37 +0900)]
Bump mini-css-extract-plugin from 1.6.0 to 1.6.2 (#16444)

Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 1.6.0 to 1.6.2.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v1.6.0...v1.6.2)

---
updated-dependencies:
- dependency-name: mini-css-extract-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump oj from 3.11.6 to 3.11.7 (#16437)
dependabot[bot] [Wed, 30 Jun 2021 14:36:36 +0000 (23:36 +0900)]
Bump oj from 3.11.6 to 3.11.7 (#16437)

Bumps [oj](https://github.com/ohler55/oj) from 3.11.6 to 3.11.7.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.11.6...v3.11.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoMerge pull request #1559 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Wed, 30 Jun 2021 09:13:38 +0000 (11:13 +0200)]
Merge pull request #1559 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Wed, 30 Jun 2021 07:43:18 +0000 (09:43 +0200)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoFix missing on_delete: :cascade for canonical_email_blocks foreign key (#16448)
Claire [Wed, 30 Jun 2021 04:13:55 +0000 (06:13 +0200)]
Fix missing on_delete: :cascade for canonical_email_blocks foreign key (#16448)

4 years agoMerge pull request #1558 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Tue, 29 Jun 2021 23:01:43 +0000 (01:01 +0200)]
Merge pull request #1558 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years ago[Glitch] Hide /about/more footer link in limited federation mode
David Sterry [Sun, 27 Jun 2021 20:31:28 +0000 (13:31 -0700)]
[Glitch] Hide /about/more footer link in limited federation mode

Port 7c27ccb8d8fda060f3c5b234f7c81fc29b5fc915 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Tue, 29 Jun 2021 22:42:52 +0000 (00:42 +0200)]
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
  Removed upstream, while we had a checkbox telling people to check if the
  issue was present upstream. Removed the file as well.

4 years agoFix #16407 (#16432)
David Sterry [Sun, 27 Jun 2021 20:31:28 +0000 (13:31 -0700)]
Fix #16407 (#16432)

4 years agoReplace to issue form (#16429)
Yamagishi Kazutoshi [Fri, 25 Jun 2021 13:01:52 +0000 (22:01 +0900)]
Replace to issue form (#16429)

4 years agoMerge pull request #1557 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Fri, 25 Jun 2021 10:20:46 +0000 (12:20 +0200)]
Merge pull request #1557 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Fri, 25 Jun 2021 08:44:06 +0000 (10:44 +0200)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoFix styling of boost button in media modal not reflecting ability to boost (#16387)
Claire [Fri, 25 Jun 2021 02:45:30 +0000 (04:45 +0200)]
Fix styling of boost button in media modal not reflecting ability to boost (#16387)

4 years agoFix WebUI crash when a toot with a playing video gets deleted (#16384)
Claire [Fri, 25 Jun 2021 02:45:17 +0000 (04:45 +0200)]
Fix WebUI crash when a toot with a playing video gets deleted (#16384)

* Fix WebUI crash when a toot with a playing video gets deleted

* Fix pop-up player not closing the moment a status is deleted

4 years agoFix compression-webpack-plugin configuration (#16356)
Claire [Fri, 25 Jun 2021 02:45:04 +0000 (04:45 +0200)]
Fix compression-webpack-plugin configuration (#16356)

compression-webpack-plugin 6.0.0 has changed how filenames were generated,
so from #14892 onward (Mastodon v3.3.0 and later), compressed files were
output to a file named `.gz` instead of the correct filenames.

4 years agoMerge pull request #1556 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Thu, 24 Jun 2021 17:22:13 +0000 (19:22 +0200)]
Merge pull request #1556 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Thu, 24 Jun 2021 16:59:19 +0000 (18:59 +0200)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoBump rubocop from 1.16.1 to 1.17.0 (#16424)
dependabot[bot] [Thu, 24 Jun 2021 15:55:34 +0000 (00:55 +0900)]
Bump rubocop from 1.16.1 to 1.17.0 (#16424)

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.16.1 to 1.17.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.16.1...v1.17.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump rubocop-rails from 2.10.1 to 2.11.0 (#16419)
dependabot[bot] [Thu, 24 Jun 2021 14:57:03 +0000 (23:57 +0900)]
Bump rubocop-rails from 2.10.1 to 2.11.0 (#16419)

Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.10.1 to 2.11.0.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.10.1...v2.11.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump bindata from 2.4.8 to 2.4.10 (#16430)
dependabot[bot] [Thu, 24 Jun 2021 14:56:43 +0000 (23:56 +0900)]
Bump bindata from 2.4.8 to 2.4.10 (#16430)

Bumps [bindata](https://github.com/dmendel/bindata) from 2.4.8 to 2.4.10.
- [Release notes](https://github.com/dmendel/bindata/releases)
- [Changelog](https://github.com/dmendel/bindata/blob/master/ChangeLog.rdoc)
- [Commits](https://github.com/dmendel/bindata/compare/v2.4.8...v2.4.10)

---
updated-dependencies:
- dependency-name: bindata
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoMerge pull request #1555 from ClearlyClaire/glitch-soc/fixes/video-player-crash
Claire [Thu, 24 Jun 2021 14:00:26 +0000 (16:00 +0200)]
Merge pull request #1555 from ClearlyClaire/glitch-soc/fixes/video-player-crash

[Glitch] Fix WebUI crash when a toot with a playing video gets deleted

4 years ago[Glitch] Fix styling of boost button in media modal not reflecting ability to boost
Claire [Fri, 11 Jun 2021 15:52:22 +0000 (17:52 +0200)]
[Glitch] Fix styling of boost button in media modal not reflecting ability to boost

Port tootsuite#16387 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoFix pop-up player not closing the moment a status is deleted
Claire [Thu, 10 Jun 2021 13:51:20 +0000 (15:51 +0200)]
Fix pop-up player not closing the moment a status is deleted

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoFix WebUI crash when a toot with a playing video gets deleted
Claire [Thu, 10 Jun 2021 14:08:31 +0000 (16:08 +0200)]
Fix WebUI crash when a toot with a playing video gets deleted

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge pull request #1553 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Thu, 24 Jun 2021 13:16:38 +0000 (15:16 +0200)]
Merge pull request #1553 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Thu, 24 Jun 2021 06:08:02 +0000 (08:08 +0200)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoBump @babel/runtime from 7.14.5 to 7.14.6 (#16423)
dependabot[bot] [Wed, 23 Jun 2021 22:50:13 +0000 (07:50 +0900)]
Bump @babel/runtime from 7.14.5 to 7.14.6 (#16423)

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

---
updated-dependencies:
- dependency-name: "@babel/runtime"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump eslint from 7.28.0 to 7.29.0 (#16422)
dependabot[bot] [Wed, 23 Jun 2021 22:49:56 +0000 (07:49 +0900)]
Bump eslint from 7.28.0 to 7.29.0 (#16422)

Bumps [eslint](https://github.com/eslint/eslint) from 7.28.0 to 7.29.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.28.0...v7.29.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump oj from 3.11.5 to 3.11.6 (#16421)
dependabot[bot] [Wed, 23 Jun 2021 22:49:40 +0000 (07:49 +0900)]
Bump oj from 3.11.5 to 3.11.6 (#16421)

Bumps [oj](https://github.com/ohler55/oj) from 3.11.5 to 3.11.6.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.11.5...v3.11.6)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump sass from 1.34.1 to 1.35.1 (#16420)
dependabot[bot] [Wed, 23 Jun 2021 22:49:29 +0000 (07:49 +0900)]
Bump sass from 1.34.1 to 1.35.1 (#16420)

Bumps [sass](https://github.com/sass/dart-sass) from 1.34.1 to 1.35.1.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.34.1...1.35.1)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump @babel/core from 7.14.5 to 7.14.6 (#16425)
dependabot[bot] [Wed, 23 Jun 2021 22:48:37 +0000 (07:48 +0900)]
Bump @babel/core from 7.14.5 to 7.14.6 (#16425)

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

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump ws from 7.4.6 to 7.5.0 (#16426)
dependabot[bot] [Wed, 23 Jun 2021 22:47:47 +0000 (07:47 +0900)]
Bump ws from 7.4.6 to 7.5.0 (#16426)

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

---
updated-dependencies:
- dependency-name: ws
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoFix newlines in accout notes added by the Move handler (#16415)
Claire [Wed, 23 Jun 2021 21:55:47 +0000 (23:55 +0200)]
Fix newlines in accout notes added by the Move handler (#16415)

* Fix newlines in account notes added by the move handler

* Make MoveWorker more robust

4 years agoAdd full user agent in tooltips for login activities (#16428)
Claire [Wed, 23 Jun 2021 14:42:23 +0000 (16:42 +0200)]
Add full user agent in tooltips for login activities (#16428)

Also adds timestamp in HTML itself to not rely on javascript

4 years agoMerge pull request #1551 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Wed, 23 Jun 2021 10:49:09 +0000 (12:49 +0200)]
Merge pull request #1551 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoFix login date not showing up in login history by using “public” pack
Claire [Wed, 23 Jun 2021 10:21:40 +0000 (12:21 +0200)]
Fix login date not showing up in login history by using “public” pack

4 years ago[Glitch] Add authentication history
Eugen Rochko [Mon, 21 Jun 2021 15:07:30 +0000 (17:07 +0200)]
[Glitch] Add authentication history

Port SCSS changes from d174d12c831989bf1d5d3ca54d4f26d28c2c8925 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Wed, 23 Jun 2021 08:46:24 +0000 (10:46 +0200)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoFix serialization of followers/following counts when user hides their network (#16418)
Claire [Mon, 21 Jun 2021 18:14:47 +0000 (20:14 +0200)]
Fix serialization of followers/following counts when user hides their network (#16418)

* Add tests

* Fix serialization of followers/following counts when user hides their network

Fixes #16382

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoAdd authentication history (#16408)
Eugen Rochko [Mon, 21 Jun 2021 15:07:30 +0000 (17:07 +0200)]
Add authentication history (#16408)

4 years agoBump @babel/plugin-proposal-decorators from 7.14.2 to 7.14.5 (#16401)
dependabot[bot] [Fri, 18 Jun 2021 08:25:20 +0000 (17:25 +0900)]
Bump @babel/plugin-proposal-decorators from 7.14.2 to 7.14.5 (#16401)

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

---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-decorators"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump @babel/plugin-transform-runtime from 7.14.3 to 7.14.5 (#16394)
dependabot[bot] [Fri, 18 Jun 2021 07:54:24 +0000 (16:54 +0900)]
Bump @babel/plugin-transform-runtime from 7.14.3 to 7.14.5 (#16394)

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

---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-runtime"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump @babel/plugin-transform-react-inline-elements (#16406)
dependabot[bot] [Fri, 18 Jun 2021 07:04:38 +0000 (16:04 +0900)]
Bump @babel/plugin-transform-react-inline-elements (#16406)

Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-react-inline-elements) from 7.12.13 to 7.14.5.
- [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.14.5/packages/babel-plugin-transform-react-inline-elements)

---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-react-inline-elements"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump @babel/preset-react from 7.13.13 to 7.14.5 (#16400)
dependabot[bot] [Fri, 18 Jun 2021 07:04:07 +0000 (16:04 +0900)]
Bump @babel/preset-react from 7.13.13 to 7.14.5 (#16400)

Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react) from 7.13.13 to 7.14.5.
- [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.14.5/packages/babel-preset-react)

---
updated-dependencies:
- dependency-name: "@babel/preset-react"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump @babel/preset-env from 7.14.4 to 7.14.5 (#16402)
dependabot[bot] [Fri, 18 Jun 2021 05:41:52 +0000 (14:41 +0900)]
Bump @babel/preset-env from 7.14.4 to 7.14.5 (#16402)

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

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoMerge pull request #1550 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Wed, 16 Jun 2021 10:42:40 +0000 (12:42 +0200)]
Merge pull request #1550 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years ago[Glitch] Fix OCR failure when erroneous lang data is in cache
Claire [Tue, 15 Jun 2021 20:11:07 +0000 (22:11 +0200)]
[Glitch] Fix OCR failure when erroneous lang data is in cache

Port 8428faa0859d86c97950084658498a2c25e26f15 to glitch-soc

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

Conflicts:
- `Gemfile.lock`: upstream-updated dependency (redis) textually too close to
   glitch-specific one (redcarpet).
   Ported upstream change.