]>
cat aescling's git repositories - mastodon.git/log
kibigo! [Fri, 11 Feb 2022 03:20:27 +0000 (19:20 -0800)]
Merge pull request #34 from kibicat/merge_glicth-soc_2022-01-31
Merge glitch-soc as of 2022-02-06
single-right-quote [Sun, 6 Feb 2022 20:27:28 +0000 (20:27 +0000)]
Merge remote-tracking branch 'origin' into merge_glicth-soc_2022-01-31
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
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.
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
potpro [Sat, 5 Feb 2022 16:29:54 +0000 (01:29 +0900)]
Update build-image.yml (#17454)
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
Claire [Sat, 5 Feb 2022 09:58:51 +0000 (10:58 +0100)]
Move glitch-soc-specific theming methods to ThemingConcern
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
Eugen Rochko [Sat, 5 Feb 2022 04:06:34 +0000 (05:06 +0100)]
Fix error on account relationships page in admin UI (#17444)
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>
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>
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>
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>
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>
single-right-quote [Thu, 3 Feb 2022 17:04:58 +0000 (17:04 +0000)]
Merge remote-tracking branch 'origin' into merge_glicth-soc_2022-01-31
Eugen Rochko [Thu, 3 Feb 2022 13:21:38 +0000 (14:21 +0100)]
Forward-port version bump to 3.4.6 (#17434)
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
Claire [Thu, 3 Feb 2022 13:09:04 +0000 (14:09 +0100)]
Fix compacted JSON-LD possibly causing compatibility issues on forwarding (#17428)
Claire [Thu, 3 Feb 2022 13:07:43 +0000 (14:07 +0100)]
Fix response_to_recipient? CTE (#17427)
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>
Claire [Wed, 2 Feb 2022 10:49:22 +0000 (11:49 +0100)]
Bump version to 3.4.6
Claire [Mon, 6 Dec 2021 07:32:31 +0000 (08:32 +0100)]
Fix response_to_recipient? CTE
Claire [Wed, 2 Feb 2022 10:55:57 +0000 (11:55 +0100)]
Fix compacted JSON-LD possibly causing compatibility issues on forwarding
Puck Meerburg [Sat, 22 Jan 2022 13:48:27 +0000 (13:48 +0000)]
Compact JSON-LD signed incoming activities
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
Claire [Tue, 1 Feb 2022 19:59:28 +0000 (20:59 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream
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>
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
Rohan Sharma [Tue, 1 Feb 2022 16:34:48 +0000 (22:04 +0530)]
Fixed prototype pollution bug and only allow trusted origin (#17420)
Claire [Mon, 31 Jan 2022 20:27:40 +0000 (21:27 +0100)]
Bump version to 3.4.5 (#17402)
single-right-quote [Mon, 31 Jan 2022 18:33:05 +0000 (18:33 +0000)]
Merge remote-tracking branch 'origin' into merge_glicth-soc_2022-01-31
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
Claire [Mon, 31 Jan 2022 09:42:17 +0000 (10:42 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream
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/
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`)
Claire [Sun, 30 Jan 2022 22:49:52 +0000 (23:49 +0100)]
Change index corruption warning to be a little less scary (#17395)
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
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)
Claire [Sun, 30 Jan 2022 21:33:30 +0000 (22:33 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream
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
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.
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
Claire [Fri, 28 Jan 2022 08:07:56 +0000 (09:07 +0100)]
Fix Sidekiq warning when pushing DMs to direct timeline
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.
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.
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.
Claire [Thu, 27 Jan 2022 17:13:41 +0000 (18:13 +0100)]
Fix some old database migrations (#17379)
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>
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>
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>
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'.
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.
Su Yang [Wed, 26 Jan 2022 17:08:49 +0000 (01:08 +0800)]
Add healthcheck for sidekiq (#17365)
Eugen Rochko [Wed, 26 Jan 2022 17:05:39 +0000 (18:05 +0100)]
Fix poll updates being saved as status edits (#17373)
Fix #17344
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
Claire [Wed, 26 Jan 2022 13:09:11 +0000 (14:09 +0100)]
Add link to /about/more to the CAPTCHA verification page
Claire [Wed, 26 Jan 2022 12:24:51 +0000 (13:24 +0100)]
Add some explanation text on the CAPTCHA confirmation page
Claire [Wed, 26 Jan 2022 10:13:38 +0000 (11:13 +0100)]
Add mention of accessibility issues to hCaptcha option in admin page
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
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.
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.
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.
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Claire [Mon, 24 Jan 2022 21:12:57 +0000 (22:12 +0100)]
Disable captcha if registrations are disabled for various reasons
Claire [Mon, 24 Jan 2022 20:52:45 +0000 (21:52 +0100)]
Renew Rails session ID on successful registration
Claire [Mon, 24 Jan 2022 20:36:22 +0000 (21:36 +0100)]
Fix tests
Claire [Mon, 24 Jan 2022 20:29:50 +0000 (21:29 +0100)]
Please CodeClimate
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.
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.
Claire [Mon, 24 Jan 2022 02:29:03 +0000 (03:29 +0100)]
Fix link_to_login argument handling when a block is passed (#17345)
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
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>
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>
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.
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 .
Claire [Sun, 23 Jan 2022 15:01:25 +0000 (16:01 +0100)]
Change `percent` to `rate` in retention metrics API (#16910)
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
Claire [Sun, 23 Jan 2022 14:50:41 +0000 (15:50 +0100)]
Remove support for OAUTH_REDIRECT_AT_SIGN_IN (#17287)
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.
Claire [Sun, 23 Jan 2022 14:46:30 +0000 (15:46 +0100)]
Remove leftover database columns from Devise::Models::Rememberable (#17191)
* Remove leftover database columns from Devise::Models::Rememberable
* Update fix-duplication maintenance script
* Improve errors/warnings in the fix-duplicates maintenance script
Claire [Sun, 23 Jan 2022 12:53:58 +0000 (13:53 +0100)]
Remove old duplicate index (#17245)
Some Mastodon versions (v1.1 and v1.2) had a duplicate index in `db/schema.rb`
without any migration script creating it. #2224 (included in v1.3) removed the
duplicate index from the file but did not provide a migration script to remove
it.
This means that any instance that was installed from v1.1 or v1.2's source code
has a duplicate index and a corresponding warning in PgHero. Instances set up
using an earlier or later Mastodon version do not have this issue.
This PR removes the duplicate index if it is present.
Claire [Thu, 20 Jan 2022 19:56:21 +0000 (20:56 +0100)]
Fix text being incorrectly pre-selected in composer textarea on /share (#17339)
Fixes #17295
Claire [Thu, 20 Jan 2022 13:51:23 +0000 (14:51 +0100)]
Change mastodon:webpush:generate_vapid_key task to not require functional env (#17338)
Fixes #17297
Claire [Thu, 20 Jan 2022 12:37:31 +0000 (13:37 +0100)]
Add post edited notice in admin and public UIs (#17335)
* Add edited toot flag on public pages
* Add toot edit flag to admin pages
Claire [Wed, 19 Jan 2022 23:02:17 +0000 (00:02 +0100)]
Add content-type to status source in glitch-soc
Eugen Rochko [Wed, 19 Jan 2022 21:37:27 +0000 (22:37 +0100)]
[Glitch] Add support for editing for published statuses
Port front-end changes from
1060666c583670bb3b89ed5154e61038331e30c3 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Claire [Wed, 19 Jan 2022 22:52:53 +0000 (23:52 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream