Noa Himesaka
5894051838
Merge branch 'glitch-soc:main' into main
2023-10-11 10:23:34 +09:00
Claire
53f5b27bd1
Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream
2023-10-08 17:30:48 +02:00
Claire
ac2370778a
Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream
...
Conflicts:
- `config/environments/production.rb`:
Upstream enforced a code style change and glitch-soc had a few different lines.
Applied upstream's code style to glitch-soc's changes.
2023-10-08 17:21:12 +02:00
Claire
74c27e33e3
Merge commit '37bbd3c1064380a756b4e821655d7697105f99f5' into glitch-soc/merge-upstream
2023-10-08 17:10:39 +02:00
Claire
a5dbb1ee5a
Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream
2023-10-08 17:05:40 +02:00
Claire
3262d1f1b6
Fix incorrect serialization of regional languages in contentMap
( #27207 )
2023-10-06 17:46:04 +02:00
Michael Stanclift
3171afc36a
Add Elasticsearch index size to Admin dashboard ( #27301 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-06 17:02:55 +02:00
Claire
3c13d70600
Add mention of YJIT in admin dashboard if enabled ( #27283 )
2023-10-05 13:10:17 +02:00
Matt Jankowski
2f8f92df48
Fix Elastic check deprecation warning about gem version ( #27262 )
2023-10-03 15:52:47 +02:00
Claire
ceb365c419
Fix boosts of local users being filtered in account timelines ( #27204 )
2023-10-03 12:21:42 +02:00
Jakob Gillich
770fd993ec
Fix importer returning negative row estimates ( #27258 )
2023-10-03 10:47:50 +02:00
Noa Himesaka
dcbe49f91b
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-10-01 20:01:10 +09:00
Claire
abdb58840a
Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream
2023-09-26 13:13:27 +02:00
Claire
3de6dcf634
Add redirection on /deck
URLs for logged-out users ( #27128 )
2023-09-25 15:07:10 +02:00
Renaud Chaput
4aaaf0dde3
Fix the search documentation URL in system checks ( #27036 )
2023-09-22 10:13:53 +02:00
Noa Himesaka
bb54d35539
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-09-20 10:32:05 +09:00
Claire
f546b0c999
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-19 17:07:29 +02:00
Claire
eeab3560fc
Merge pull request from GHSA-v3xf-c9qf-j667
2023-09-19 16:53:58 +02:00
Claire
94893cf24f
Merge pull request from GHSA-hcqf-fw2r-52g4
...
* Revert "Fix request URL normalisation for bare domain and 8-bit characters (#26285 )"
This reverts commit 8891d8945d
.
* Revert "Do not normalize URL before fetching it (#26219 )"
This reverts commit fd284311e7
.
2023-09-19 16:52:52 +02:00
Noa Himesaka
9aac7933bd
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-09-17 13:43:33 +09:00
Claire
dfc05ec8df
Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream modified this file close to a line modified by glitch-soc to
disable the ARMv64 builder (as glitch-soc doesn't have one).
Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
Upstream modified this file close to lines changed by glitch-soc to
change the Docker image repositories used (only ghcr, and based on the
organization's name).
Ported upstream's changes.
2023-09-15 21:43:49 +02:00
Claire
08b495d95c
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
2023-09-15 21:06:45 +02:00
Claire
5d8c65f2a7
Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream
2023-09-15 20:57:40 +02:00
Claire
3ca94f6d4a
Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' into glitch-soc/merge-upstream
2023-09-15 20:21:40 +02:00
Claire
6273416292
Fix post edits not being forwarded as expected ( #26936 )
2023-09-15 19:54:32 +02:00
Noa Himesaka
b947d4a54d
Merge branch 'glitch-soc:main' into main
2023-09-10 12:57:51 +09:00
Eugen Rochko
3a679844e4
Fix account_id
, max_id
and min_id
params not working in search ( #26847 )
2023-09-08 14:25:00 +02:00
Eugen Rochko
a90b0056cc
Fix #hashtag
matching on individual components in search ( #26835 )
2023-09-07 12:53:41 +02:00
Claire
1f99d86287
Fix blocked domain appears from account feed ( #26823 )
...
Co-authored-by: Jeong Arm <kjwonmail@gmail.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-09-06 21:04:48 +02:00
Claire
b83e487502
Fix moderator rights inconsistencies ( #26729 )
2023-09-06 16:40:19 +02:00
Claire
223f9ca665
Fix crash when encountering invalid URL ( #26814 )
2023-09-06 12:17:51 +02:00
Claire
77caba3789
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-05 20:34:17 +02:00
Claire
cab4cbfa5c
Fix “Scoped order is ignored, it's forced to be batch order.” warnings ( #26793 )
2023-09-05 15:37:23 +02:00
Claire
e66f961e05
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-04 18:27:46 +02:00
Eugen Rochko
ece1ff77d6
Add in:library
syntax to search ( #26760 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-09-04 17:20:35 +02:00
Eugen Rochko
68b4e36c82
Fix #hashtag
matching non-hashtagged posts in search ( #26781 )
2023-09-04 10:18:45 +02:00
Eugen Rochko
e52d0494ee
Fix before:
, after:
and during:
failing when time zone not set ( #26782 )
2023-09-04 09:09:25 +02:00
Noa Himesaka
d79d7e2215
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-09-04 11:47:59 +09:00
Claire
c107512fa6
Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream
2023-09-02 15:02:29 +02:00
Claire
ac2dae0d11
Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-releases.yml`:
Upstream changed comments close to a line we modified to account for
different container image repositories.
Updated the comments as upstream did.
2023-09-02 13:50:16 +02:00
Claire
ffb486648c
Merge commit 'cb9f96036cf78835e22aafb30b80717b5a8b7394' into glitch-soc/merge-upstream
2023-09-02 13:34:54 +02:00
Claire
c8aa3d6d06
Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream
2023-09-02 12:02:23 +02:00
Claire
6b7c47311d
Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream
2023-09-02 11:41:40 +02:00
Claire
16681e0f20
Add admin notifications for new Mastodon versions ( #26582 )
2023-09-01 17:47:07 +02:00
Eugen Rochko
e754083e8a
Fix unmatched quotes and prefixes causing search to fail ( #26701 )
2023-09-01 09:43:12 +02:00
Eugen Rochko
0008458128
Fix search queries with slash causing or-condition ( #26699 )
2023-08-31 19:04:44 +02:00
Claire
9bb2fb6b14
Change importers to avoid a few inefficiencies ( #26721 )
2023-08-31 19:04:27 +02:00
Claire
5c38c3a9a1
Change text extraction in PlainTextFormatter
to be faster ( #26727 )
2023-08-30 17:36:16 +02:00
Eugen Rochko
bba76e7267
Change language:
to attempt to match to a known value in search ( #26663 )
2023-08-30 16:07:26 +02:00
Claire
9e77ab7db2
Change private statuses index to index without crutches ( #26713 )
2023-08-29 17:51:13 +02:00