]> cat aescling's git repositories - mastodon.git/log
mastodon.git
4 years agoRework actions modal to bring it closer to upstream and fix modal stacking issue
Claire [Wed, 9 Feb 2022 13:39:12 +0000 (14:39 +0100)]
Rework actions modal to bring it closer to upstream and fix modal stacking issue

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

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

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

Simplify it a bit and make it closer to upstream

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

Merge upstream changes

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

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

* Remove language detection through cld3

* Update app/helpers/languages_helper.rb

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

- Remove the session-based locale stickyness

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

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

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

* Fix structured data parsing from links choking on bad data

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

* Remove unnecessary slash escapes from CDATA regex pattern

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

* Refactor tests

* Add tests

* Fix replies collection incorrectly looping

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

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

Merge upstream changes

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

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

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

* Add tests

* Fix instance actor not being dereferenceable

* Fix tests

* Fix tests for real

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

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

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

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

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

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

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

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

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump redis from 4.0.2 to 4.0.3 (#17412)
dependabot[bot] [Sat, 5 Feb 2022 04:03:06 +0000 (13:03 +0900)]
Bump redis from 4.0.2 to 4.0.3 (#17412)

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

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump sidekiq-scheduler from 3.1.0 to 3.1.1 (#17407)
dependabot[bot] [Sat, 5 Feb 2022 04:02:57 +0000 (13:02 +0900)]
Bump sidekiq-scheduler from 3.1.0 to 3.1.1 (#17407)

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

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump http-link-header from 1.0.3 to 1.0.4 (#17414)
dependabot[bot] [Sat, 5 Feb 2022 04:02:42 +0000 (13:02 +0900)]
Bump http-link-header from 1.0.3 to 1.0.4 (#17414)

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

---
updated-dependencies:
- dependency-name: http-link-header
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoUpdate tootsuite/mastodon Docker tag to v3.4.6 (#17436)
Alexandra Catalina [Thu, 3 Feb 2022 20:29:20 +0000 (12:29 -0800)]
Update tootsuite/mastodon Docker tag to v3.4.6 (#17436)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
4 years agoForward-port version bump to 3.4.6 (#17434)
Eugen Rochko [Thu, 3 Feb 2022 13:21:38 +0000 (14:21 +0100)]
Forward-port version bump to 3.4.6 (#17434)

4 years agoMerge pull request #1676 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Thu, 3 Feb 2022 13:09:19 +0000 (14:09 +0100)]
Merge pull request #1676 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoFix compacted JSON-LD possibly causing compatibility issues on forwarding (#17428)
Claire [Thu, 3 Feb 2022 13:09:04 +0000 (14:09 +0100)]
Fix compacted JSON-LD possibly causing compatibility issues on forwarding (#17428)

4 years agoFix response_to_recipient? CTE (#17427)
Claire [Thu, 3 Feb 2022 13:07:43 +0000 (14:07 +0100)]
Fix response_to_recipient? CTE (#17427)

4 years agoCompact JSON-LD signed incoming activities (#17426)
Claire [Thu, 3 Feb 2022 13:07:29 +0000 (14:07 +0100)]
Compact JSON-LD signed incoming activities (#17426)

Co-authored-by: Puck Meerburg <puck@puck.moe>
4 years agoBump version to 3.4.6
Claire [Wed, 2 Feb 2022 10:49:22 +0000 (11:49 +0100)]
Bump version to 3.4.6

4 years agoFix response_to_recipient? CTE
Claire [Mon, 6 Dec 2021 07:32:31 +0000 (08:32 +0100)]
Fix response_to_recipient? CTE

4 years agoFix compacted JSON-LD possibly causing compatibility issues on forwarding
Claire [Wed, 2 Feb 2022 10:55:57 +0000 (11:55 +0100)]
Fix compacted JSON-LD possibly causing compatibility issues on forwarding

4 years agoCompact JSON-LD signed incoming activities
Puck Meerburg [Sat, 22 Jan 2022 13:48:27 +0000 (13:48 +0000)]
Compact JSON-LD signed incoming activities

4 years agoMerge pull request #1675 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Tue, 1 Feb 2022 20:41:58 +0000 (21:41 +0100)]
Merge pull request #1675 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Tue, 1 Feb 2022 19:59:28 +0000 (20:59 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoUpdate tootsuite/mastodon Docker tag to v3.4.5 (#17417)
Alexandra Catalina [Tue, 1 Feb 2022 19:57:50 +0000 (11:57 -0800)]
Update tootsuite/mastodon Docker tag to v3.4.5 (#17417)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
4 years agoFix requiring an extra restart after recent post-deployment migrations (#17422)
Claire [Tue, 1 Feb 2022 19:57:39 +0000 (20:57 +0100)]
Fix requiring an extra restart after recent post-deployment migrations (#17422)

Follow-up to #16409

4 years agoFixed prototype pollution bug and only allow trusted origin (#17420)
Rohan Sharma [Tue, 1 Feb 2022 16:34:48 +0000 (22:04 +0530)]
Fixed prototype pollution bug and only allow trusted origin (#17420)

4 years agoBump version to 3.4.5 (#17402)
Claire [Mon, 31 Jan 2022 20:27:40 +0000 (21:27 +0100)]
Bump version to 3.4.5 (#17402)

4 years agoMerge pull request #1674 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Mon, 31 Jan 2022 09:51:11 +0000 (10:51 +0100)]
Merge pull request #1674 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Mon, 31 Jan 2022 09:42:17 +0000 (10:42 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoBump NODE_VER to 16.13.2, to solve security issues (#17399)
Daniel Jakots [Sun, 30 Jan 2022 23:32:03 +0000 (18:32 -0500)]
Bump NODE_VER to 16.13.2, to solve security issues (#17399)

Fixes CVE-2021-44532, CVE-2021-44533, and CVE-2022-21824.
See: https://nodejs.org/en/blog/vulnerability/jan-2022-security-releases/

4 years agoAdd more advanced migration tests (#17393)
Claire [Sun, 30 Jan 2022 22:50:08 +0000 (23:50 +0100)]
Add more advanced migration tests (#17393)

- populate the database with some data when testing migrations
- try both one-step and two-step migrations (`SKIP_POST_DEPLOYMENT_MIGRATIONS`)

4 years agoChange index corruption warning to be a little less scary (#17395)
Claire [Sun, 30 Jan 2022 22:49:52 +0000 (23:49 +0100)]
Change index corruption warning to be a little less scary (#17395)

4 years agoMerge pull request #1673 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Sun, 30 Jan 2022 21:51:32 +0000 (22:51 +0100)]
Merge pull request #1673 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoFix edge case in migration helpers that caused crash because of PostgreSQL quirks...
Claire [Sun, 30 Jan 2022 21:34:54 +0000 (22:34 +0100)]
Fix edge case in migration helpers that caused crash because of PostgreSQL quirks (#17398)

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Sun, 30 Jan 2022 21:33:30 +0000 (22:33 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoFix some old migration scripts (#17394)
Claire [Sun, 30 Jan 2022 20:38:54 +0000 (21:38 +0100)]
Fix some old migration scripts (#17394)

* Fix some old migration scripts

* Fix edge case in two-step migration from older releases

4 years agoChange public profile pages to be disabled for unconfirmed users (#17385)
Claire [Fri, 28 Jan 2022 13:24:37 +0000 (14:24 +0100)]
Change public profile pages to be disabled for unconfirmed users (#17385)

Fixes #17382

Note that unconfirmed and unapproved accounts can still be searched for
and their (empty) account retrieved using the REST API.

4 years agoMerge pull request #1668 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Fri, 28 Jan 2022 08:38:44 +0000 (09:38 +0100)]
Merge pull request #1668 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoFix Sidekiq warning when pushing DMs to direct timeline
Claire [Fri, 28 Jan 2022 08:07:56 +0000 (09:07 +0100)]
Fix Sidekiq warning when pushing DMs to direct timeline

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Fri, 28 Jan 2022 07:58:32 +0000 (08:58 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `Gemfile.lock`:
  Upstream-updated lib textually too close to glitch-soc-only dep.
  Updated like upstream.

4 years agoRefactor and improve tests (#17386)
Claire [Thu, 27 Jan 2022 23:46:42 +0000 (00:46 +0100)]
Refactor and improve tests (#17386)

* Change account and user fabricators to simplify and improve tests

- `Fabricate(:account)` implicitly fabricates an associated `user` if
  no `domain` attribute is given (an account with `domain: nil` is
  considered a local account, but no user record was created), unless
  `user: nil` is passed
- `Fabricate(:account, user: Fabricate(:user))` should still be possible
  but is discouraged.

* Fix and refactor tests

- avoid passing unneeded attributes to `Fabricate(:user)` or
  `Fabricate(:account)`
- avoid embedding `Fabricate(:user)` into a `Fabricate(:account)` or the other
  way around
- prefer `Fabricate(:user, account_attributes: â€¦)` to
  `Fabricate(:user, account: Fabricate(:account, â€¦)`
- also, some tests were using remote accounts with local user records, which is
  not representative of production code.

4 years agoFix Sidekiq warnings about JSON serialization (#17381)
Claire [Thu, 27 Jan 2022 23:43:56 +0000 (00:43 +0100)]
Fix Sidekiq warnings about JSON serialization (#17381)

* Fix Sidekiq warnings about JSON serialization

This occurs on every symbol argument we pass, and every symbol key in hashes,
because Sidekiq expects strings instead.

See https://github.com/mperham/sidekiq/pull/5071

We do not need to change how workers parse their arguments because this has
not changed and we were already converting to symbols adequately or using
`with_indifferent_access`.

* Set Sidekiq to raise on unsafe arguments in test mode

In order to more easily catch issues that would produce warnings in production
code.

4 years agoFix some old database migrations (#17379)
Claire [Thu, 27 Jan 2022 17:13:41 +0000 (18:13 +0100)]
Fix some old database migrations (#17379)

4 years agoBump pg from 1.2.3 to 1.3.0 (#17349)
dependabot[bot] [Thu, 27 Jan 2022 11:26:40 +0000 (20:26 +0900)]
Bump pg from 1.2.3 to 1.3.0 (#17349)

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

---
updated-dependencies:
- dependency-name: pg
  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 axios from 0.24.0 to 0.25.0 (#17354)
dependabot[bot] [Thu, 27 Jan 2022 11:26:18 +0000 (20:26 +0900)]
Bump axios from 0.24.0 to 0.25.0 (#17354)

Bumps [axios](https://github.com/axios/axios) from 0.24.0 to 0.25.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.24.0...v0.25.0)

---
updated-dependencies:
- dependency-name: axios
  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 rdf-normalize from 0.4.0 to 0.5.0 (#17226)
dependabot[bot] [Thu, 27 Jan 2022 11:25:18 +0000 (20:25 +0900)]
Bump rdf-normalize from 0.4.0 to 0.5.0 (#17226)

Bumps [rdf-normalize](https://github.com/ruby-rdf/rdf-normalize) from 0.4.0 to 0.5.0.
- [Release notes](https://github.com/ruby-rdf/rdf-normalize/releases)
- [Commits](https://github.com/ruby-rdf/rdf-normalize/compare/0.4.0...0.5.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Wed, 26 Jan 2022 21:32:21 +0000 (22:32 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `config/environments/production.rb`:
  Upstream changed a header but we had different default headers.
  Applied the same change, and also dropped HSTS headers redundant with
  Rails'.

4 years agoFix local distribution of edited statuses (#17380)
Claire [Wed, 26 Jan 2022 19:53:50 +0000 (20:53 +0100)]
Fix local distribution of edited statuses (#17380)

Because `FanOutOnWriteService#update?` was broken, edits were considered as new
toots and a regular `update` payload was sent.

4 years agoAdd healthcheck for sidekiq (#17365)
Su Yang [Wed, 26 Jan 2022 17:08:49 +0000 (01:08 +0800)]
Add healthcheck for sidekiq (#17365)

4 years agoFix poll updates being saved as status edits (#17373)
Eugen Rochko [Wed, 26 Jan 2022 17:05:39 +0000 (18:05 +0100)]
Fix poll updates being saved as status edits (#17373)

Fix #17344

4 years agoMerge pull request #1667 from ClearlyClaire/glitch-soc/fixes/hcaptcha-text
Claire [Wed, 26 Jan 2022 13:24:10 +0000 (14:24 +0100)]
Merge pull request #1667 from ClearlyClaire/glitch-soc/fixes/hcaptcha-text

Improve explanations around the hCaptcha feature

4 years agoAdd link to /about/more to the CAPTCHA verification page
Claire [Wed, 26 Jan 2022 13:09:11 +0000 (14:09 +0100)]
Add link to /about/more to the CAPTCHA verification page

4 years agoAdd some explanation text on the CAPTCHA confirmation page
Claire [Wed, 26 Jan 2022 12:24:51 +0000 (13:24 +0100)]
Add some explanation text on the CAPTCHA confirmation page

4 years agoAdd mention of accessibility issues to hCaptcha option in admin page
Claire [Wed, 26 Jan 2022 10:13:38 +0000 (11:13 +0100)]
Add mention of accessibility issues to hCaptcha option in admin page

4 years agoMerge pull request #1665 from ClearlyClaire/glitch-soc/features/hcaptcha
Claire [Tue, 25 Jan 2022 23:13:24 +0000 (00:13 +0100)]
Merge pull request #1665 from ClearlyClaire/glitch-soc/features/hcaptcha

Add optional hCaptcha support

4 years agoChange CAPTCHA handling to be only on email verification
Claire [Tue, 25 Jan 2022 22:56:57 +0000 (23:56 +0100)]
Change CAPTCHA handling to be only on email verification

This simplifies the implementation considerably, and while not providing
ideal UX, it's the most flexible approach.

4 years agoAdd ability to set hCaptcha either on registration form or on e-mail validation
Claire [Tue, 25 Jan 2022 21:37:12 +0000 (22:37 +0100)]
Add ability to set hCaptcha either on registration form or on e-mail validation

Upshot of CAPTCHA on e-mail validation is it does not need to break the in-band
registration API.

4 years agoDisable `registrations` flag in /api/v1/instance when CAPTCHA is enabled
Claire [Tue, 25 Jan 2022 12:54:11 +0000 (13:54 +0100)]
Disable `registrations` flag in /api/v1/instance when CAPTCHA is enabled

This is to avoid apps trying and failing at using the registrations API,
which does not let us require a CAPTCHA and cannot be clearly signaled as
unavailable.

4 years agoBump sass from 1.48.0 to 1.49.0 (#17352)
dependabot[bot] [Tue, 25 Jan 2022 12:25:26 +0000 (21:25 +0900)]
Bump sass from 1.48.0 to 1.49.0 (#17352)

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

---
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 json-ld-preloaded from 3.1.6 to 3.2.0 (#17353)
dependabot[bot] [Tue, 25 Jan 2022 12:23:42 +0000 (21:23 +0900)]
Bump json-ld-preloaded from 3.1.6 to 3.2.0 (#17353)

Bumps [json-ld-preloaded](https://github.com/ruby-rdf/json-ld-preloaded) from 3.1.6 to 3.2.0.
- [Release notes](https://github.com/ruby-rdf/json-ld-preloaded/releases)
- [Commits](https://github.com/ruby-rdf/json-ld-preloaded/compare/3.1.6...3.2.0)

---
updated-dependencies:
- dependency-name: json-ld-preloaded
  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 fabrication from 2.23.1 to 2.24.0 (#17356)
dependabot[bot] [Tue, 25 Jan 2022 12:22:51 +0000 (21:22 +0900)]
Bump fabrication from 2.23.1 to 2.24.0 (#17356)

Bumps [fabrication](https://github.com/paulelliott/fabrication) from 2.23.1 to 2.24.0.
- [Release notes](https://github.com/paulelliott/fabrication/releases)
- [Changelog](https://github.com/paulelliott/fabrication/blob/master/Changelog.markdown)
- [Commits](https://github.com/paulelliott/fabrication/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump sidekiq from 6.3.1 to 6.4.0 (#17350)
dependabot[bot] [Tue, 25 Jan 2022 12:22:10 +0000 (21:22 +0900)]
Bump sidekiq from 6.3.1 to 6.4.0 (#17350)

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

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump @babel/plugin-transform-runtime from 7.16.8 to 7.16.10 (#17361)
dependabot[bot] [Tue, 25 Jan 2022 11:52:40 +0000 (20:52 +0900)]
Bump @babel/plugin-transform-runtime from 7.16.8 to 7.16.10 (#17361)

Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.16.8 to 7.16.10.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.16.10/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 cld3 from 3.4.3 to 3.4.4 (#17357)
dependabot[bot] [Tue, 25 Jan 2022 11:48:05 +0000 (20:48 +0900)]
Bump cld3 from 3.4.3 to 3.4.4 (#17357)

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

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump aws-sdk-s3 from 1.111.1 to 1.111.3 (#17368)
dependabot[bot] [Tue, 25 Jan 2022 11:46:52 +0000 (20:46 +0900)]
Bump aws-sdk-s3 from 1.111.1 to 1.111.3 (#17368)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.111.1 to 1.111.3.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump bootsnap from 1.10.1 to 1.10.2 (#17367)
dependabot[bot] [Tue, 25 Jan 2022 11:45:45 +0000 (20:45 +0900)]
Bump bootsnap from 1.10.1 to 1.10.2 (#17367)

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

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoBump node-fetch from 2.6.1 to 2.6.7 (#17366)
dependabot[bot] [Tue, 25 Jan 2022 11:44:01 +0000 (20:44 +0900)]
Bump node-fetch from 2.6.1 to 2.6.7 (#17366)

Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.1 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.1...v2.6.7)

---
updated-dependencies:
- dependency-name: node-fetch
  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 agoBump nanoid from 3.1.23 to 3.2.0 (#17342)
dependabot[bot] [Tue, 25 Jan 2022 11:41:22 +0000 (20:41 +0900)]
Bump nanoid from 3.1.23 to 3.2.0 (#17342)

Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.23 to 3.2.0.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.1.23...3.2.0)

---
updated-dependencies:
- dependency-name: nanoid
  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 agoBump @babel/preset-env from 7.16.8 to 7.16.11 (#17358)
dependabot[bot] [Tue, 25 Jan 2022 11:39:43 +0000 (20:39 +0900)]
Bump @babel/preset-env from 7.16.8 to 7.16.11 (#17358)

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.16.8 to 7.16.11.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.16.11/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 rubocop from 1.24.1 to 1.25.0 (#17322)
dependabot[bot] [Tue, 25 Jan 2022 11:39:08 +0000 (20:39 +0900)]
Bump rubocop from 1.24.1 to 1.25.0 (#17322)

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.24.1 to 1.25.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.24.1...v1.25.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 @babel/core from 7.16.7 to 7.16.12 (#17360)
dependabot[bot] [Tue, 25 Jan 2022 11:34:55 +0000 (20:34 +0900)]
Bump @babel/core from 7.16.7 to 7.16.12 (#17360)

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.16.7 to 7.16.12.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.16.12/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 rails from 6.1.4.1 to 6.1.4.4 (#17159)
dependabot[bot] [Tue, 25 Jan 2022 11:34:37 +0000 (20:34 +0900)]
Bump rails from 6.1.4.1 to 6.1.4.4 (#17159)

* Bump rails from 6.1.4.1 to 6.1.4.4

Bumps [rails](https://github.com/rails/rails) from 6.1.4.1 to 6.1.4.4.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v6.1.4.1...v6.1.4.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
* Revert marcel to 1.0.1

Avoid some regression that need to be investigated

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
4 years agoDisable captcha if registrations are disabled for various reasons
Claire [Mon, 24 Jan 2022 21:12:57 +0000 (22:12 +0100)]
Disable captcha if registrations are disabled for various reasons

4 years agoRenew Rails session ID on successful registration
Claire [Mon, 24 Jan 2022 20:52:45 +0000 (21:52 +0100)]
Renew Rails session ID on successful registration

4 years agoFix tests
Claire [Mon, 24 Jan 2022 20:36:22 +0000 (21:36 +0100)]
Fix tests

4 years agoPlease CodeClimate
Claire [Mon, 24 Jan 2022 20:29:50 +0000 (21:29 +0100)]
Please CodeClimate

4 years agoAdd optional hCaptcha support
Claire [Mon, 24 Jan 2022 18:06:19 +0000 (19:06 +0100)]
Add optional hCaptcha support

Fixes #1649

This requires setting `HCAPTCHA_SECRET_KEY` and `HCAPTCHA_SITE_KEY`, then
enabling the admin setting at
`/admin/settings/edit#form_admin_settings_captcha_enabled`

Subsequently, a hCaptcha widget will be displayed on `/about` and
`/auth/sign_up` unless:
- the user is already signed-up already
- the user has used an invite link
- the user has already solved the captcha (and registration failed for another
  reason)

The Content-Security-Policy headers are altered automatically to allow the
third-party hCaptcha scripts on `/about` and `/auth/sign_up` following the same
rules as above.

4 years agodisable legacy XSS filtering (#17289)
Wonderfall [Mon, 24 Jan 2022 12:14:26 +0000 (13:14 +0100)]
disable legacy XSS filtering (#17289)

Browsers are phasing out X-XSS-Protection, but Safari and IE still support it.

4 years agoFix link_to_login argument handling when a block is passed (#17345)
Claire [Mon, 24 Jan 2022 02:29:03 +0000 (03:29 +0100)]
Fix link_to_login argument handling when a block is passed (#17345)

4 years agoMerge pull request #1663 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Sun, 23 Jan 2022 18:17:31 +0000 (19:17 +0100)]
Merge pull request #1663 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years ago[Glitch] Change `percent` to `rate` in retention metrics API
Claire [Sun, 23 Jan 2022 15:01:25 +0000 (16:01 +0100)]
[Glitch] Change `percent` to `rate` in retention metrics API

Port a63495230a3a28e022504f36356cd75b17b635ba to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years ago[Glitch] Fix text being incorrectly pre-selected in composer textarea on /share
Claire [Sun, 23 Jan 2022 17:24:34 +0000 (18:24 +0100)]
[Glitch] Fix text being incorrectly pre-selected in composer textarea on /share

Port 3a103cd317fd56aca27fca01e03647df44e3ffd2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Sun, 23 Jan 2022 17:13:55 +0000 (18:13 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `spec/models/status_spec.rb`:
  Upstream added tests too close to glitch-soc-specific tests.
  Kept both tests.

4 years agoFix error-prone SQL queries (#15828)
Claire [Sun, 23 Jan 2022 17:10:10 +0000 (18:10 +0100)]
Fix error-prone SQL queries (#15828)

* Fix error-prone SQL queries in Account search

While this code seems to not present an actual vulnerability, one could
easily be introduced by mistake due to how the query is built.

This PR parameterises the `to_tsquery` input to make the query more robust.

* Harden code for Status#tagged_with_all and Status#tagged_with_none

Those two scopes aren't used in a way that could be vulnerable to an SQL
injection, but keeping them unchanged might be a hazard.

* Remove unneeded spaces surrounding tsquery term

* Please CodeClimate

* Move advanced_search_for SQL template to its own function

This avoids one level of indentation while making clearer that the SQL template
isn't build from all the dynamic parameters of advanced_search_for.

* Add tests covering tagged_with, tagged_with_all and tagged_with_none

* Rewrite tagged_with_none to avoid multiple joins and make it more robust

* Remove obsolete brakeman warnings

* Revert "Remove unneeded spaces surrounding tsquery term"

The two queries are not strictly equivalent.

This reverts commit 86f16c537e06c6ba4a8b250f25dcce9f049023ff.

4 years agoChange `percent` to `rate` in retention metrics API (#16910)
Claire [Sun, 23 Jan 2022 15:01:25 +0000 (16:01 +0100)]
Change `percent` to `rate` in retention metrics API (#16910)

4 years agoAdd OMNIAUTH_ONLY environment variable to enforce externa log-in (#17288)
Claire [Sun, 23 Jan 2022 14:52:58 +0000 (15:52 +0100)]
Add OMNIAUTH_ONLY environment variable to enforce externa log-in (#17288)

* Remove support for OAUTH_REDIRECT_AT_SIGN_IN

Fixes #15959

Introduced in #6540, OAUTH_REDIRECT_AT_SIGN_IN allowed skipping the log-in form
to instead redirect to the external OmniAuth login provider.

However, it did not prevent the log-in form on /about introduced by #10232 from
appearing, and completely broke with the introduction of #15228.

As I restoring that previous log-in flow without introducing a security
vulnerability may require extensive care and knowledge of how OmniAuth works,
this commit removes support for OAUTH_REDIRECT_AT_SIGN_IN instead for the time
being.

* Add OMNIAUTH_ONLY environment variable to enforce external log-in only

* Disable user registration when OMNIAUTH_ONLY is set to true

* Replace log-in links When OMNIAUTH_ONLY is set with exactly one OmniAuth provider