Commit Graph

21246 Commits (main)
 

Author SHA1 Message Date
anna 60d54db810
merge with catstodon/main 1 month ago
Jeremy Kescher e995f70ed3
Fix certain jsx files being in an old state in relation to the emoji reactions PR 1 month ago
Jeremy Kescher 55aef6a70c
Fix scss styles being in an old state 1 month ago
Jeremy Kescher 6d6a5561f8
Catstodon rev reset due to upstream version bump 1 month ago
Jeremy Kescher ce878a78bb
Merge branch 'glitch-soc' into develop 1 month ago
Claire d7d477047e Bump version to v4.3.0-alpha.3 (#29241) 1 month ago
Claire 6c1b6194f7 Merge pull request from GHSA-jhrq-qvrm-qr36
* Fix insufficient Content-Type checking of fetched ActivityStreams objects

* Allow JSON-LD documents with multiple profiles
1 month ago
renovate[bot] 63080e10a9 Update dependency pg to v1.5.5 (#29230)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 month ago
Claire e7ca82762d Fix user creation failure handling in OAuth paths (#29207) 1 month ago
Jeremy Kescher f044841a6e
Catstodon rev +1.0.18 1 month ago
Jeremy Kescher 1c9291adcd
Merge branch 'glitch-soc' into develop
# Conflicts:
#	app/javascript/flavours/glitch/styles/components/accounts.scss
#	app/javascript/flavours/glitch/styles/components/status.scss
1 month ago
Claire 486e4bc7d3 Fix OmniAuth tests (#29201) 1 month ago
Claire 40439399c6 Bump version to v4.3.0-alpha.2 (#29200) 1 month ago
Claire 53b73ed6a2 Merge pull request from GHSA-vm39-j3vx-pch3
* Prevent different identities from a same SSO provider from accessing a same account

* Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true`

* Rename methods to avoid confusion between OAuth and OmniAuth
1 month ago
Emelia Smith 436419cc2f Merge pull request from GHSA-7w3c-p9j8-mq3x
* Ensure destruction of OAuth Applications notifies streaming

Due to doorkeeper using a dependent: delete_all relationship, the destroy of an OAuth Application bypassed the existing AccessTokenExtension callbacks for announcing destructing of access tokens.

* Ensure password resets revoke access to Streaming API

* Improve performance of deleting OAuth tokens

---------

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 month ago
Claire 3c3ef8b9d3 Add `sidekiq_unique_jobs:delete_all_locks` task and disable `sidekiq-unique-jobs` UI by default (#29199) 1 month ago
Emelia Smith eae436c5a8 Disable administrative doorkeeper routes (#29187) 1 month ago
Emelia Smith b83076647e Ignore legacy moderator and admin columns on User model (#29188) 1 month ago
renovate[bot] 7100106f3f Update dependency sidekiq-unique-jobs to v7.1.33 (#29175)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 month ago
renovate[bot] 04da8f887b Update dependency pghero to v3.4.1 (#29144)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 month ago
renovate[bot] d9d0a6ef33 Update dependency irb to v1.11.2 (#29135)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 month ago
renovate[bot] 93b365bfc0 Update dependency webmock to v3.20.0 (#29120)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 month ago
Claire e3c4e90646
Fix new list button being blank (#2616) 2 months ago
Claire 084d051e6c
Merge pull request #2608 from ClearlyClaire/glitch-soc/refactor/monolithic-components-css
Merge SCSS in a single `components.scss` file
2 months ago
Claire c249c10f74 Fix account suggestion size inconsistency with upstream 2 months ago
Jeremy Kescher 924912bf9b
Catstodon rev +1.0.17 2 months ago
Essem 4cbaf46950
Hydrate reactions on streaming API 2 months ago
Essem d61b323c84
Purge status reactions on account delete 2 months ago
Claire d391e01b59 Revert notification bar color for now 2 months ago
Claire 3f89cec3c9 Further reduce differences with upstream 2 months ago
Claire f6f62002c7 Remove leftovers from glitch-soc's layout option 2 months ago
Claire 189b70cd6a Merge SCSS in a single `components.scss` file 2 months ago
Jeremy Kescher e4a333c6ae
Adjust initial_state_serializer to state of updated emoji reactions PR 2 months ago
Jeremy Kescher 40ef7b3849
Merge branch 'glitch-soc' into develop
# Conflicts:
#	app/javascript/flavours/glitch/initial_state.js
#	app/serializers/initial_state_serializer.rb
2 months ago
Claire 8c76a208ed
Merge pull request #2607 from ClearlyClaire/glitch-soc/cherry-pick-upstream
Cherry-pick upstream changes
2 months ago
Eugen Rochko 65eb943b9d Fix confirmation e-mails when signing up through an app (#29064) 2 months ago
Claire 19f1ffe287 Fix self-destruct schedule not actually replacing initial schedule (#29049) 2 months ago
renovate[bot] 5ea36a3606 Update dependency brakeman to v6.1.2 (#29062)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2 months ago
renovate[bot] b27cad27c2 Update dependency bootsnap to '~> 1.18.0' (#29019)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2 months ago
renovate[bot] 63f1f1465a Update dependency tzinfo-data to v1.2024.1 (#29052)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2 months ago
Matt Jankowski 4cd00c0dd9 Update `nsa` gem to version 0.3.0 (#29065) 2 months ago
renovate[bot] c6f7e3a1fb Update dependency haml_lint to v0.56.0 (#29082)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2 months ago
renovate[bot] 93aa783aa1 Update dependency nokogiri to v1.16.2 [SECURITY] (#29106)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2 months ago
renovate[bot] 868333c86f Update dependency capybara to v3.40.0 (#28966)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2 months ago
renovate[bot] ac49514bd6 Update dependency chewy to v7.5.1 (#29018)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2 months ago
github-actions[bot] a2611d782c
New Crowdin Translations (automated) (#2588)
* New Crowdin translations

* Fix bogus translation files

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 months ago
JS Moore 541cbdd963
Add env variable support for number of followable hashtags in feed column (#2500)
* Add env variable support for number of followable hashtags in feed column.

* Add a note about performance concerns for higher values.

See discussion in https://github.com/glitch-soc/mastodon/pull/2500

* Update .devcontainer/docker-compose.yml

---------

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 months ago
Essem 08e511cecb
Fix doodle modal icons (#2597) 2 months ago
Jeremy Kescher a08e32d1e1
Merge branch 'glitch-soc' into develop 2 months ago
anna 1caf07f427
merge with catstodon/main 2 months ago