mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity
23,542 Commits 2 Branches 16 Tags 298 MiB
Commit Graph

1344 Commits

Author SHA1 Message Date
Siph d45e85cbf2
Merge tag 'v4.3.2' 2024-12-03 21:56:55 +01:00
Claire c2d65f7142 Merge commit '13ab4b54e2b9cb9ddfcbe9dd3d820a7ba9164412' into glitch-soc/stable-4.3 2024-12-03 15:17:19 +01:00
Claire 13ab4b54e2
Bump version to v4.3.2 (#33136) 2024-12-03 15:16:28 +01:00
Claire 0d69cc068c Merge commit '26f25ef4bafd5ad84d03d8cb7ad0d868360175e5' into glitch-soc/stable-4.3 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/trends/statuses.rb`:
  Upstream added a date restriction to trendable posts, while glitch-soc had
  slightly different conditions.
  Added the date restriction to glitch-soc's conditions.
 2024-12-02 21:49:12 +01:00
Claire 5532d1c2cb Add `tootctl feeds vacuum` (#33065) 2024-12-02 16:20:32 +01:00
Claire 6b8ff1cf6e Fix `TagFollow` records not being correctly handled in account operations (#33063) 2024-12-02 16:20:32 +01:00
Claire cc5c125cc7 Fix uploading higher-than-wide GIF profile picture with libvips enabled (#32911) 2024-12-02 16:20:32 +01:00
Matt Jankowski 90f2c7a1e9 Fix error in CLI EmailDomainBlocks when supplying `--with-dns-records` (#32863) 2024-12-02 16:20:32 +01:00
Eugen Rochko 0720ef5f62 Fix `min_id` and `max_id` causing error in search API (#32857) 2024-12-02 16:20:32 +01:00
Siph 763fab2ec2
Merge tag 'v4.3.1' 2024-11-06 10:27:50 +01:00
Claire 90f6984ff1 Merge tag 'v4.3.1' into glitch-soc/backports-4.3 2024-10-21 11:06:25 +02:00
Claire 9adb96f3a1
Bump version to v4.3.1 (#32582) 
Co-authored-by: David Roetzel <david@roetzel.de>
 2024-10-21 10:58:01 +02:00
Claire b091e531a5 Merge commit '49b3d5692e6f217e6506674ad8a623a4ba8d0c5f' into glitch-soc/backports-4.3 2024-10-15 17:42:22 +02:00
Claire ee61f7772a Add further warnings about encryption secrets (#32476) 2024-10-15 11:57:59 +02:00
Claire b40adb4a89 Merge commit 'f99da81ef8b14a851347503d4177f83322c16d9a' into glitch-soc/stable-4.3 2024-10-14 19:18:08 +02:00
Claire 81472396bc Add note about not changing ActiveRecord encryption secrets once they are set (#32413) 2024-10-14 13:14:38 +02:00
Matt Jankowski 9e04e46521 Reference `IpBlock.severities` keys from CLI option check (#32291) 2024-10-14 13:14:38 +02:00
Siph c424034186
Merge tag 'v4.3.0' into glitch-soc-release 2024-10-08 18:59:10 +02:00
Claire 4a859140ec Merge commit 'edcf3d9234b03d6b1c4b29d1d15339f7f64040fb' into glitch-soc/backports-4.3 2024-10-07 20:03:53 +02:00
Claire edcf3d9234
Bump version to v4.3.0 (#32283) 2024-10-07 17:37:05 +02:00
Claire dfe851b476 Merge branch 'stable-4.3' into glitch-soc/backports-4.3 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
 2024-10-05 20:45:05 +02:00
Emelia Smith f397550311 Add detection and download of material_symbol icons in config/navigation.rb (#31366) 2024-10-04 17:48:03 +02:00
Siph 21fc9033f6
merge upstream 2024-09-30 22:02:02 +02:00
Claire 9af9ef6fb3 Merge commit '03210085b7481568cc507f088144aaf1dae73c88' into glitch-soc/merge-upstream 2024-09-30 13:04:19 +02:00
Claire 03210085b7
Bump version to 4.3.0-rc.1 (#32124) 2024-09-30 10:42:59 +00:00
Claire 7ef25ae53b Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream 2024-09-29 11:06:09 +02:00
Claire 886baa5e35
Fix typo causing incorrect error being raised in blurhash processing failure (#32104) 2024-09-26 07:40:59 +00:00
Claire 6de18bb475 Merge commit '3e91c101b3c4b5166dab778837e38bed424b4333' into glitch-soc/merge-upstream 2024-09-17 17:54:00 +02:00
Claire 3e91c101b3
Bump version to 4.3.0-beta.2 (#31948) 2024-09-17 15:42:45 +00:00
Claire 665e9129fe Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/custom_emoji.rb`:
  An upstream refactor touched lines adjacent to ones modified in glitch-soc.
  Ported upstream's changes.
 2024-09-16 21:08:58 +02:00
Claire e0648a916a
Rename `/api/v2_alpha/notifications*` to `/api/v2/notifications*` (#31840) 2024-09-16 12:10:02 +00:00
Claire 83b553c7d1 Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream 2024-09-12 21:32:39 +02:00
Taylor Chaparro 1b6a82b799
Fix invalid date searches returning 503 (#31526) 2024-09-12 13:40:20 +00:00
Claire 10e2b87774 Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream 2024-09-12 12:09:21 +02:00
Matt Jankowski c4b09d684e
Extract method for account-referencing in CLI prune task (#31824) 2024-09-10 13:23:55 +00:00
Claire 441af2632d Merge commit '2caa3f365ded73be17b623177967110e66f14061' into glitch-soc/merge-upstream 2024-09-09 18:22:41 +02:00
Mike Dalessio 10143d053a
Change some instances of Nokogiri HTML4 parsing to HTML5 (#31812) 2024-09-08 18:41:37 +00:00
Claire 29124990a2 Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream reworked how CSS classes for the document's body are computed.
  Slight conflict due to glitch-soc's different theming system.
  Updated as upstream did.
 2024-09-06 19:25:31 +02:00
Matt Jankowski be77a1098b
Extract `Account::AUTOMATED_ACTOR_TYPES` for "bot" actor_type values (#31772) 2024-09-06 07:49:38 +00:00
Claire 1a0ef0c526 Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream 2024-09-05 20:36:25 +02:00
David Roetzel f85694acfd
Add credentials to redis sentinel configuration (#31768) 2024-09-05 14:06:58 +00:00
David Roetzel 7d91723f05
Support `REDIS_SENTINEL_PORT` variables (#31767) 2024-09-05 09:26:49 +00: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
David Roetzel ef2bc8ea26
Add redis sentinel support to ruby part of code (#31744) 2024-09-04 14:10:45 +00:00
Claire fef055db96 Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream 
Conflicts:
- `spec/requests/api/v1/timelines/tag_spec.rb`:
  Upstream refactored this file, while we had a change to switch a default setting.
  Updated as upstream did.
- `spec/views/statuses/show.html.haml_spec.rb`:
  Upstream refactored this file, while we stubbed different methods.
  Updated as upstream did, and updated the stubs accordingly.
 2024-09-03 21:51:53 +02:00
Matt Jankowski 2f0d0fc127
Add coverage for `CLI::Accounts#fix_duplications` task (#30639) 2024-09-03 15:36:59 +00:00
Claire 402c1e116d Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream 2024-09-02 17:43:10 +02:00
David Roetzel 388d5473e1
Refactor (ruby) redis configuration (#31694) 2024-09-02 14:19:55 +00:00
Claire 6f35e93f72 Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream 2024-08-31 16:06:04 +02:00
Matt Jankowski 85e8d1f285
Use rails configuration storage for paperclip path (#31651) 2024-08-30 09:46:09 +00:00