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
Jeremy Kescher
c0382b1446
Mark nightly version
CodeQL / Analyze (javascript) (push) Has been cancelled
Check formatting / lint (push) Has been cancelled
CSS Linting / lint (push) Has been cancelled
Bundler Audit / security (push) Has been cancelled
Check i18n / check-i18n (push) Has been cancelled
JavaScript Linting / lint (push) Has been cancelled
JavaScript Testing / test (push) Has been cancelled
Ruby Testing / build (production) (push) Has been cancelled
Ruby Testing / build (test) (push) Has been cancelled
CodeQL / Analyze (ruby) (push) Has been cancelled
Haml Linting / lint (push) Has been cancelled
Ruby Linting / lint (push) Has been cancelled
Historical data migration test / test (14-alpine) (push) Has been cancelled
Historical data migration test / test (15-alpine) (push) Has been cancelled
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Ruby Testing / test (3.1) (push) Has been cancelled
Ruby Testing / test (3.2) (push) Has been cancelled
Ruby Testing / Libvips tests (.ruby-version) (push) Has been cancelled
Ruby Testing / Libvips tests (3.1) (push) Has been cancelled
Ruby Testing / Libvips tests (3.2) (push) Has been cancelled
Ruby Testing / End to End testing (.ruby-version) (push) Has been cancelled
Ruby Testing / End to End testing (3.1) (push) Has been cancelled
Ruby Testing / End to End testing (3.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
2024-08-31 13:12:03 +02:00
Jeremy Kescher
9c355a240b
Merge remote-tracking branch 'upstream/main' into develop
2024-08-31 12:53:19 +02:00
Matt Jankowski
85e8d1f285
Use rails configuration storage for paperclip path ( #31651 )
2024-08-30 09:46:09 +00:00
Jeremy Kescher
232b6409f5
New versioning scheme, bump Catstodon revision to 1.0.0
Bundler Audit / security (push) Has been cancelled
Check i18n / check-i18n (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
CodeQL / Analyze (ruby) (push) Has been cancelled
Crowdin / Upload translations / upload-translations (push) Has been cancelled
Check formatting / lint (push) Has been cancelled
CSS Linting / lint (push) Has been cancelled
Haml Linting / lint (push) Has been cancelled
JavaScript Linting / lint (push) Has been cancelled
Ruby Linting / lint (push) Has been cancelled
JavaScript Testing / test (push) Has been cancelled
Historical data migration test / test (14-alpine) (push) Has been cancelled
Historical data migration test / test (15-alpine) (push) Has been cancelled
Ruby Testing / build (production) (push) Has been cancelled
Ruby Testing / build (test) (push) Has been cancelled
Ruby Testing / test (3.1) (push) Has been cancelled
Ruby Testing / End to End testing (3.1) (push) Has been cancelled
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Ruby Testing / test (3.2) (push) Has been cancelled
Ruby Testing / Libvips tests (.ruby-version) (push) Has been cancelled
Ruby Testing / Libvips tests (3.1) (push) Has been cancelled
Ruby Testing / Libvips tests (3.2) (push) Has been cancelled
Ruby Testing / End to End testing (.ruby-version) (push) Has been cancelled
Ruby Testing / End to End testing (3.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
2024-08-26 19:07:22 +02:00
Claire
11b8017b45
Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream
2024-08-26 18:52:33 +02:00
Jeremy Kescher
7df41062ba
Merge branch 'glitch' into develop
2024-08-26 18:31:12 +02:00
Matt Jankowski
bcc4b1078c
Fix Rails/RootPathnameMethods cop ( #31582 )
2024-08-26 07:35:07 +00:00
Claire
d0529b810a
Merge commit '97f6baf977212e84125ac325176ad305ad5b068a' into glitch-soc/merge-upstream
2024-08-24 12:06:31 +02:00
Claire
97f6baf977
Bump version to v4.3.0-beta.1 ( #30989 )
2024-08-23 16:07:32 +00:00
Claire
c493689e84
Change output format of repo:changelog task ( #31546 )
2024-08-23 12:55:54 +00:00
Jeremy Kescher
1c0c393a19
Bump Catstodon revision to 1.0.10
Bundler Audit / security (push) Has been cancelled
Check i18n / check-i18n (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
CodeQL / Analyze (ruby) (push) Has been cancelled
Check formatting / lint (push) Has been cancelled
CSS Linting / lint (push) Has been cancelled
Haml Linting / lint (push) Has been cancelled
JavaScript Linting / lint (push) Has been cancelled
Ruby Linting / lint (push) Has been cancelled
JavaScript Testing / test (push) Has been cancelled
Historical data migration test / test (14-alpine) (push) Has been cancelled
Historical data migration test / test (15-alpine) (push) Has been cancelled
Ruby Testing / build (production) (push) Has been cancelled
Ruby Testing / build (test) (push) Has been cancelled
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Ruby Testing / test (3.1) (push) Has been cancelled
Ruby Testing / test (3.2) (push) Has been cancelled
Ruby Testing / Libvips tests (.ruby-version) (push) Has been cancelled
Ruby Testing / Libvips tests (3.1) (push) Has been cancelled
Ruby Testing / Libvips tests (3.2) (push) Has been cancelled
Ruby Testing / End to End testing (.ruby-version) (push) Has been cancelled
Ruby Testing / End to End testing (3.1) (push) Has been cancelled
Ruby Testing / End to End testing (3.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
2024-08-18 18:10:19 +02:00
Jeremy Kescher
909a3b41a1
Bump Catstodon revision to 1.0.9
Bundler Audit / security (push) Has been cancelled
Check i18n / check-i18n (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
CodeQL / Analyze (ruby) (push) Has been cancelled
Crowdin / Upload translations / upload-translations (push) Has been cancelled
Check formatting / lint (push) Has been cancelled
CSS Linting / lint (push) Has been cancelled
Haml Linting / lint (push) Has been cancelled
JavaScript Linting / lint (push) Has been cancelled
Ruby Linting / lint (push) Has been cancelled
JavaScript Testing / test (push) Has been cancelled
Historical data migration test / test (14-alpine) (push) Has been cancelled
Historical data migration test / test (15-alpine) (push) Has been cancelled
Ruby Testing / build (production) (push) Has been cancelled
Ruby Testing / build (test) (push) Has been cancelled
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Ruby Testing / test (3.1) (push) Has been cancelled
Ruby Testing / test (3.2) (push) Has been cancelled
Ruby Testing / Libvips tests (.ruby-version) (push) Has been cancelled
Ruby Testing / Libvips tests (3.1) (push) Has been cancelled
Ruby Testing / Libvips tests (3.2) (push) Has been cancelled
Ruby Testing / End to End testing (.ruby-version) (push) Has been cancelled
Ruby Testing / End to End testing (3.1) (push) Has been cancelled
Ruby Testing / End to End testing (3.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
2024-08-16 16:08:01 +02:00
Jeremy Kescher
08e538f8a4
Merge branch 'glitch' into develop
2024-08-16 16:05:14 +02:00
Claire
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
Django
709dcd07f2
Add support for incoming <s> tag ( #31375 )
2024-08-12 11:10:05 +00:00
Jeremy Kescher
7d8714db81
Bump Catstodon revision to 1.0.8
2024-08-11 19:12:59 +02:00
Jeremy Kescher
084cfb7d6c
Merge branch 'refs/heads/glitch' into develop
2024-08-11 19:09:56 +02:00
Claire
31a00c0c1a
Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream
2024-08-09 17:15:32 +02:00
Claire
cbdd8edf68
Revamp notification policy options ( #31343 )
2024-08-09 13:30:55 +00:00
Claire
08adca0c63
Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-soc/merge-upstream
2024-08-06 17:27:48 +02:00
Christian Schmidt
9d0cafd06b
Check Content-Length in ResponseWithLimitAdapter ( #31285 )
2024-08-06 08:23:48 +00:00
Jeremy Kescher
4e0b287075
Bump Catstodon revision to 1.0.7
2024-08-05 21:46:46 +02:00
Jeremy Kescher
81609f09ba
Bump Catstodon revision to 1.0.6
2024-08-04 13:50:03 +02:00
Jeremy Kescher
dfb5ac3b98
Bump Catstodon revision to 1.0.5
2024-08-01 00:29:17 +02:00
Jeremy Kescher
f3a55891e0
Merge branch 'refs/heads/glitch' into develop
2024-08-01 00:27:00 +02:00
Claire
8dd671a977
Merge commit 'a50c8e951f03a8eb53957ad1c3703155b223ed24' into glitch-soc/merge-upstream
2024-07-31 18:16:01 +02:00
Jeremy Kescher
1145f232e8
Bump Catstodon revision to 1.0.4
2024-07-31 15:03:30 +02:00
Claire
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
Jeremy Kescher
5b2f994ad4
Bump Catstodon revision to 1.0.3
2024-07-30 08:46:24 +02:00
Jeremy Kescher
afa0c78715
Merge branch 'refs/heads/glitch' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/actions/interactions.js
2024-07-30 08:38:14 +02:00
Claire
68000956f4
Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream
2024-07-23 19:31:23 +02:00
Matt Jankowski
1b839d2cba
Fix mastodon:stats decoration of stats rake task ( #31104 )
2024-07-23 06:51:57 +00:00
Jeremy Kescher
dcb356d256
Bump Catstodon revision to 1.0.2
2024-07-19 18:27:48 +02:00
Jeremy Kescher
5ed78a1e90
Bump Catstodon revision to 1.0.1
2024-07-16 22:38:39 +02:00
Jeremy Kescher
4f80bc8493
Merge branch 'refs/heads/glitch' into develop
2024-07-04 18:17:55 +02:00
Jeremy Kescher
245684be0f
Reset Catstodon revision to 1.0.0 for alpha.5 merge
2024-07-04 18:11:47 +02:00
Claire
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
Claire
df9e26158d
Bump version to v4.3.0-alpha.5 ( #30920 )
2024-07-04 14:59:54 +00:00
Emelia Smith
47f0faebc9
Implement HTML ruby tags for east-asian languages ( #30897 )
2024-07-03 20:05:59 +00:00
Jeremy Kescher
a2b0c0f69a
Bump Catstodon revision to 1.1.3
2024-07-02 19:33:15 +02:00
Jeremy Kescher
c1f70540c6
Merge branch 'refs/heads/glitch' into develop
2024-07-02 19:30:16 +02:00
Claire
d2aea85e6c
Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream
2024-06-30 11:25:40 +02:00
Claire
ba6a558a70
Simplify color extraction code using bandunfold ( #30869 )
2024-06-28 22:41:27 +00:00
Claire
7a84b76bb1
Drop favicon.ico generation ( #30375 )
2024-06-26 13:44:08 +00:00
Jeremy Kescher
fbf9a61c55
Bump Catstodon revision to 1.1.2
2024-06-22 13:34:56 +02:00
Jeremy Kescher
b3f731abac
Merge branch 'refs/heads/glitch-soc' into develop
2024-06-22 13:30:26 +02:00
Claire
cabd7c21fc
Merge commit '2cda1dd542b20a47245cb8d28a4f6f8750c2284c' into glitch-soc/merge-upstream
2024-06-19 19:37:37 +02:00
Claire
2cda1dd542
Fix compatibility with Redis < 6.2 again ( #30412 )
2024-06-19 16:59:37 +00:00
Jeremy Kescher
f883c171fb
Bump Catstodon revision to 1.1.1
2024-06-19 17:56:52 +02:00
Jeremy Kescher
d220eaab0a
Bump Catstodon revision to 1.1.0
2024-06-18 01:17:19 +02:00
Jeremy Kescher
29ac8c0606
Merge branch 'refs/heads/glitch-soc' into develop
2024-06-18 00:15:52 +02:00
Jeremy Kescher
463585fc3c
Bump Catstodon revision to 1.0.3
2024-06-17 22:55:11 +02:00
Jeremy Kescher
895b479c23
Merge branch 'refs/heads/glitch-soc' into develop
2024-06-17 22:52:08 +02:00
Claire
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
Michael Stanclift
d5f02adad7
Add option to use native Ruby driver for Redis ( #30717 )
2024-06-17 12:28:01 +00:00
Jeremy Kescher
b8c60aa810
Bump catstodon rev to 1.0.2
2024-06-16 05:41:46 +02:00
Jeremy Kescher
209f90f670
Merge branch 'refs/heads/glitch-soc' into develop
2024-06-16 05:32:45 +02:00
Claire
4daed855e5
Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream
2024-06-11 19:46:11 +02:00
Claire
328d3a87f5
Fix libvips color extraction when multiple maxima differ only on blue component ( #30632 )
2024-06-11 13:58:10 +00:00
Claire
7277d2f130
Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream
2024-06-07 20:30:51 +02:00
Claire
82be5d033f
Improve handling of libvips failures ( #30597 )
2024-06-07 15:39:41 +00:00
Matt Jankowski
37e4d96b70
Restore verbose option to media remove cli ( #30536 )
2024-06-07 12:39:53 +00:00
Claire
30b00ca2b5
Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream
2024-06-06 12:27:26 +02:00
Emelia Smith
e02d23b549
Change read:me scope to profile scope ( #30357 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-06-06 07:30:10 +00:00
Eugen Rochko
5f15a892fa
Add support for libvips in addition to ImageMagick ( #30090 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-06-05 19:15:39 +00:00
Claire
974335e414
Add experimental server-side notification grouping ( #29889 )
2024-06-03 08:35:59 +00:00
Jeremy Kescher
3157f2d48a
Fix sign-in issues, bump version
2024-05-31 22:30:42 +02:00
Jeremy Kescher
cb080ca3ef
Bump version to v4.3.0-alpha.4+glitch+cat+1.0.0
2024-05-30 18:51:42 +02:00
Claire
b8271f20c5
Merge commit '7f808ff6e9148f1cfe1e16d000e2405b6e31f243' into glitch-soc/merge-upstream
2024-05-30 15:41:31 +02:00
Claire
7f808ff6e9
Bump version to v4.3.0-alpha.4 ( #30482 )
2024-05-30 13:34:46 +00:00
Claire
3fa0dd0b88
Merge pull request from GHSA-c2r5-cfqr-c553
...
* Add hardening monkey-patch to prevent IP spoofing on misconfigured installations
* Remove rack-attack safelist
2024-05-30 14:24:29 +02:00
Claire
c827a98f19
Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Not a real conflict, just a line adjacent to a glitch-soc only dependency
getting updated.
Updated dependencies as upstream did.
2024-05-29 17:03:24 +02:00
Jeremy Kescher
3aa76c7383
Bump version to v4.3.0-alpha.3+glitch+cat+1.2.7
2024-05-29 14:25:32 +02:00
Claire
5d7d23999c
Fix leaking Elasticsearch connections in Sidekiq processes ( #30450 )
2024-05-29 08:15:06 +00:00
Jeremy Kescher
c1054880a3
Bump version to v4.3.0-alpha.3+glitch+cat+1.2.6
2024-05-22 23:58:09 +02:00
Jeremy Kescher
6703af29e3
Bump version to v4.3.0-alpha.3+glitch+cat+1.2.5
2024-05-21 05:52:53 +02:00
Jeremy Kescher
c9fb54fd4c
Emergency fix for charlock_holmes after ICU 75
2024-05-21 03:37:40 +02:00
Jeremy Kescher
ec9b8d058a
Bump version to v4.3.0-alpha.3+glitch+cat+1.2.3
2024-05-21 00:05:46 +02:00
Jeremy Kescher
fae98d1deb
Merge branch 'refs/heads/glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/initial_state.js
# app/javascript/mastodon/initial_state.js
2024-05-20 23:57:04 +02:00
Claire
e46321e63d
Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream
2024-05-20 12:17:36 +02:00
Matt Jankowski
def6b686ff
Fix Rails/WhereRange cop ( #30343 )
2024-05-20 09:37:36 +00:00
Jeremy Kescher
16a89487fd
Bump version to v4.3.0-alpha.3+glitch+cat+1.2.2
2024-05-17 15:35:29 +02:00
Jeremy Kescher
70c76a1f30
Merge branch 'refs/heads/glitch-soc' into develop
2024-05-17 15:33:30 +02:00
Claire
57fb2cf948
Merge commit '12472e7f407c42bcff6ee204b9f1887b5824734f' into glitch-soc/merge-upstream
2024-05-17 12:33:41 +02:00
Claire
12472e7f40
Add emphasis on ActiveRecord Encryption configuration values being secret ( #30340 )
2024-05-17 09:28:40 +00:00
Claire
2810231180
Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
Upstream renamed a helper method everywhere.
There was one glitch-soc line involving changes because of the local-only post
feature.
Ported upstream's change.
2024-05-16 19:30:10 +02:00
Claire
c2ca3d152f
Fix off-by-one in tootctl media commands ( #30306 )
2024-05-15 13:11:13 +00:00
Claire
666760f450
Merge commit '1bf661cddbc614d4076e9d9e855575fc29e976c0' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream fixed a command we have modified in glitch-soc.
Updated as upstream did.
2024-05-14 20:47:14 +02:00
Claire
b5b84fad65
Fix OpenSearch compatibility issue ( #30278 )
2024-05-14 17:54:28 +00:00
Jeremy Kescher
40bfe6a99c
Bump version to v4.3.0-alpha.3+glitch+cat+1.2.1
2024-05-14 18:56:58 +02:00
Jeremy Kescher
74ed5bf354
Merge branch 'refs/heads/glitch-soc' into develop
2024-05-14 18:56:01 +02:00
Jeremy Kescher
360fa71778
v4.3.0-alpha.3+glitch+cat+1.2.0
2024-05-11 23:36:59 +02:00
Jeremy Kescher
e73c612cb1
Merge branch 'refs/heads/glitch-soc' into develop
2024-05-11 23:31:31 +02:00
Claire
f35ba6963d
Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream
2024-05-11 22:10:56 +02:00
