mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,943 Commits
67 Branches
17 Tags
359 MiB
Commit Graph

22943 Commits (2be87dd75bd0989f0efa781d4d1d6c2871401fc3)

Author SHA1 Message Date
GitHub Actions 2be87dd75b New Crowdin translations 2024-09-06 04:30:51 +00:00
Claire 4cd74585ae
Merge pull request #2836 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 5acec087ca
 2024-09-05 22:56:10 +02:00
Michael Stanclift db6b1fe8fb [Glitch] Fix radio checkbox visibility in Report dialogs 
Port b4b639ee4a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-05 20:40:31 +02:00
Eugen Rochko cb324b5d7c [Glitch] Change design of unread conversations in web UI 
Port ec4c49082e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-05 20:40:04 +02:00
Claire 1a0ef0c526 Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream 2024-09-05 20:36:25 +02:00
Matt Jankowski 5acec087ca
Simplify basic presence validations (#29664) 2024-09-05 15:36:05 +00:00
Eugen Rochko bc435c63bd
Change width of columns in advanced web UI (#31762) 2024-09-05 14:57:53 +00:00
Matt Jankowski 850478dc14
Use `conflicted` configuration for renovate rebase strategy (#31770) 2024-09-05 14:41:14 +00:00
Matt Jankowski d58faa2018
Remove references to deprecated `Import` model (#31759) 2024-09-05 14:07:17 +00:00
David Roetzel f85694acfd
Add credentials to redis sentinel configuration (#31768) 2024-09-05 14:06:58 +00:00
Michael Stanclift b4b639ee4a
Fix radio checkbox visibility in Report dialogs (#31752) 2024-09-05 12:34:13 +00:00
Matt Jankowski e820cc30b8
Convert invites controller spec to system/request specs (#31755) 2024-09-05 11:54:27 +00:00
renovate[bot] 5b1ae15a36
Update docker.io/ruby Docker tag to v3.3.5 (#31758) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-05 11:06:05 +00:00
Matt Jankowski 8fd3e37747
Update `parser` and `rubocop` gems (#31760) 2024-09-05 10:20:27 +00:00
renovate[bot] bd8cd0c6e7
Update dependency cssnano to v7.0.6 (#31757) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-05 09:50:38 +00:00
James May f9712fad1b
Direct link to each authorized_application entry with html anchor (#31677) 
Co-authored-by: Matt Jankowski <matt@jankowski.online>
 2024-09-05 09:48:42 +00:00
Matt Jankowski ba9fd1c32e
Add coverage for `Account#prepare_contents` callback (#31748) 2024-09-05 09:48:33 +00:00
Eugen Rochko b265a654d7
Fix wrong width on content warnings and filters in web UI (#31761) 2024-09-05 09:46:11 +00:00
github-actions[bot] eb23d9f0f6
New Crowdin Translations (automated) (#31765) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-05 09:40:38 +00:00
Eugen Rochko ec4c49082e
Change design of unread conversations in web UI (#31763) 2024-09-05 09:39:59 +00:00
David Roetzel 7d91723f05
Support `REDIS_SENTINEL_PORT` variables (#31767) 2024-09-05 09:26:49 +00:00
Claire 5a1d7db309
Merge pull request #2835 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to fe04291af4
 2024-09-04 23:01:53 +02:00
Matt Jankowski 4d5c91e99a
Remove `before` block in spec with TODOs which have been TO-DONE already (#31754) 2024-09-04 19:51:40 +00:00
Matt Jankowski 4678473e54
Add `AnnualReport::Source#report_statuses` method for subclasses to use (#31753) 2024-09-04 19:50:33 +00:00
Claire cb1eaa10f2 Fix glitch-soc-only tests 2024-09-04 20:07:23 +02:00
Claire 1fb31ad9b1 [Glitch] Fix display name being displayed instead of domain in remote reports 
Port 585e369e0b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-04 19:43:21 +02:00
Claire 1d86377ba9 [Glitch] Fix all notification types being stored without filtering when polling 
Port fab29ebbe8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-04 19:42:45 +02:00
Claire 5a55180b95 Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream 
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
  Upstream rewrote top-level `describe` calls to `RSpec.describe`, and
  glitch-soc had differences in the first few tests because of the wider
  subset of HTML it accepts.
  Changed `describe` to `RSpec.describe` as upstream did, keeping
  glitch-soc's tests.
 2024-09-04 19:38:52 +02:00
Claire 559958f8c5
Fix email language when recipient has no selected locale (#31747) 2024-09-04 17:35:40 +00:00
Matt Jankowski e1b5f3fc6f
Use `response.parsed_body` for html response checks (#31750) 2024-09-04 17:29:05 +00:00
Matt Jankowski fe04291af4
Use more accurate beginning/ending times in annual report source (#31751) 2024-09-04 17:19:53 +00:00
David Roetzel ef2bc8ea26
Add redis sentinel support to ruby part of code (#31744) 2024-09-04 14:10:45 +00:00
Emelia Smith 9ba81eae3e
Streaming: Improve Redis connection options handling (#31623) 2024-09-04 14:10:26 +00:00
Claire 585e369e0b
Fix display name being displayed instead of domain in remote reports (#31613) 2024-09-04 13:43:08 +00:00
Claire fab29ebbe8
Fix all notification types being stored without filtering when polling (#31745) 2024-09-04 13:28:16 +00:00
Claire 1fcffa573c
Fix 500 error in `GET /api/v2_alpha/notifications` when there are no notifications to return (#31746) 2024-09-04 12:54:15 +00:00
Claire ee55d20fd5
Allow `POST /oauth/revoke` through CORS (#31743) 2024-09-04 10:46:28 +00:00
renovate[bot] 36710aec8b
Update dependency postcss to v8.4.45 (#31742) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-04 09:57:28 +00:00
renovate[bot] 7fb8834dd7
Update dependency pino-http to v10.3.0 (#31721) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-04 09:29:14 +00:00
renovate[bot] 44fd0803ce
Update dependency pino to v9.4.0 (#31720) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-04 09:27:12 +00:00
renovate[bot] d8bd9ef190
Update eslint (non-major) (#31684) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-04 09:25:25 +00:00
renovate[bot] ffe29ce417
Update dependency shoulda-matchers to v6.4.0 (#31731) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-04 08:58:28 +00:00
Matt Jankowski 58df00f04d
Extract method for self-referencing records in `AccountStatusCleanupPolicy` (#31244) 2024-09-04 08:52:37 +00:00
github-actions[bot] 1c17dca6d9
New Crowdin Translations (automated) (#31741) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-04 08:42:36 +00:00
renovate[bot] 393a5504e5
Update dependency ruby to v3.3.5 (#31719) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-04 08:25:37 +00:00
renovate[bot] 2c6131c9a1
Update dependency test-prof to v1.4.2 (#31733) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-04 08:23:15 +00:00
renovate[bot] 3553d6c36f
Update dependency aws-sdk-s3 to v1.160.0 (#31735) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-04 08:23:00 +00:00
renovate[bot] 612802b9e5
Update dependency sass to v1.78.0 (#31739) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-04 08:22:44 +00:00
Michael Stanclift a24049db30
Fix Corepack prompt on Devcontainer (#31729) 2024-09-04 08:20:46 +00:00
Matt Jankowski 14af5b47ac
Add coverage for model normalizations (#31734) 2024-09-04 05:12:40 +00:00