6de18bb475
Merge commit '3e91c101b3c4b5166dab778837e38bed424b4333' into glitch-soc/merge-upstream
2024-09-17 17:54:00 +02:00
3e91c101b3
Bump version to 4.3.0-beta.2 ( #31948 )
2024-09-17 15:42:45 +00:00
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
e0648a916a
Rename `/api/v2_alpha/notifications*` to `/api/v2/notifications*` ( #31840 )
2024-09-16 12:10:02 +00:00
83b553c7d1
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
1b6a82b799
Fix invalid date searches returning 503 ( #31526 )
2024-09-12 13:40:20 +00:00
10e2b87774
Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream
2024-09-12 12:09:21 +02:00
c4b09d684e
Extract method for account-referencing in CLI prune task ( #31824 )
2024-09-10 13:23:55 +00:00
441af2632d
Merge commit '2caa3f365ded73be17b623177967110e66f14061' into glitch-soc/merge-upstream
2024-09-09 18:22:41 +02:00
10143d053a
Change some instances of Nokogiri HTML4 parsing to HTML5 ( #31812 )
2024-09-08 18:41:37 +00:00
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
be77a1098b
Extract `Account::AUTOMATED_ACTOR_TYPES` for "bot" actor_type values ( #31772 )
2024-09-06 07:49:38 +00:00
1a0ef0c526
Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream
2024-09-05 20:36:25 +02:00
f85694acfd
Add credentials to redis sentinel configuration ( #31768 )
2024-09-05 14:06:58 +00:00
7d91723f05
Support `REDIS_SENTINEL_PORT` variables ( #31767 )
2024-09-05 09:26:49 +00:00
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
ef2bc8ea26
Add redis sentinel support to ruby part of code ( #31744 )
2024-09-04 14:10:45 +00:00
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
2f0d0fc127
Add coverage for `CLI::Accounts#fix_duplications` task ( #30639 )
2024-09-03 15:36:59 +00:00
402c1e116d
Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream
2024-09-02 17:43:10 +02:00
388d5473e1
Refactor (ruby) redis configuration ( #31694 )
2024-09-02 14:19:55 +00:00
6f35e93f72
Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream
2024-08-31 16:06:04 +02:00
85e8d1f285
Use rails configuration storage for paperclip path ( #31651 )
2024-08-30 09:46:09 +00:00
11b8017b45
Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream
2024-08-26 18:52:33 +02:00
bcc4b1078c
Fix `Rails/RootPathnameMethods` cop ( #31582 )
2024-08-26 07:35:07 +00:00
d0529b810a
Merge commit '97f6baf977212e84125ac325176ad305ad5b068a' into glitch-soc/merge-upstream
2024-08-24 12:06:31 +02:00
97f6baf977
Bump version to v4.3.0-beta.1 ( #30989 )
2024-08-23 16:07:32 +00:00
c493689e84
Change output format of `repo:changelog` task ( #31546 )
2024-08-23 12:55:54 +00:00
83480df820
Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added `<s>` to the list of allowed tags, the conflict is because
we have a different list of allowed tags.
Added `<s>` like upstream did.
2024-08-12 17:46:24 +02:00
709dcd07f2
Add support for incoming <s> tag ( #31375 )
2024-08-12 11:10:05 +00:00
31a00c0c1a
Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream
2024-08-09 17:15:32 +02:00
cbdd8edf68
Revamp notification policy options ( #31343 )
2024-08-09 13:30:55 +00:00
08adca0c63
Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-soc/merge-upstream
2024-08-06 17:27:48 +02:00
9d0cafd06b
Check Content-Length in ResponseWithLimitAdapter ( #31285 )
2024-08-06 08:23:48 +00:00
8dd671a977
Merge commit 'a50c8e951f03a8eb53957ad1c3703155b223ed24' into glitch-soc/merge-upstream
2024-07-31 18:16:01 +02:00
4eab6aef95
Change User-Agent to use Mastodon as the product, and http.rb as platform details ( #31192 )
2024-07-30 21:40:42 +00:00
68000956f4
Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream
2024-07-23 19:31:23 +02:00
1b839d2cba
Fix `mastodon:stats` decoration of stats rake task ( #31104 )
2024-07-23 06:51:57 +00:00
e61a7794f8
Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Conflict because glitch-soc has a different list of allowed tags.
Added upstream's new allowed tags while keeping ours.
- `spec/requests/api/v1/timelines/public_spec.rb`:
Conflict because of glitch-soc's default settings.
Updated accordingly.
2024-07-04 17:12:14 +02:00
df9e26158d
Bump version to v4.3.0-alpha.5 ( #30920 )
2024-07-04 14:59:54 +00:00
47f0faebc9
Implement HTML ruby tags for east-asian languages ( #30897 )
2024-07-03 20:05:59 +00:00
d2aea85e6c
Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream
2024-06-30 11:25:40 +02:00
ba6a558a70
Simplify color extraction code using `bandunfold` ( #30869 )
2024-06-28 22:41:27 +00:00
7a84b76bb1
Drop favicon.ico generation ( #30375 )
2024-06-26 13:44:08 +00:00
cabd7c21fc
Merge commit '2cda1dd542b20a47245cb8d28a4f6f8750c2284c' into glitch-soc/merge-upstream
2024-06-19 19:37:37 +02:00
2cda1dd542
Fix compatibility with Redis < 6.2 again ( #30412 )
2024-06-19 16:59:37 +00:00
395b9011ee
Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Not a real conflict, just upstream adding a method textually adjacent to
glitch-soc only code.
Ported upstream's change.
2024-06-17 18:30:28 +02:00
d5f02adad7
Add option to use native Ruby driver for Redis ( #30717 )
2024-06-17 12:28:01 +00:00
4daed855e5
Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream
2024-06-11 19:46:11 +02:00
328d3a87f5
Fix libvips color extraction when multiple maxima differ only on blue component ( #30632 )
2024-06-11 13:58:10 +00:00
Claire
Taylor Chaparro
Matt Jankowski
Mike Dalessio
David Roetzel
Django
Christian Schmidt
Emelia Smith
Michael Stanclift