Claire
c31020044b
Merge commit '38fe6ecd05e9349717b60452eff6e5ff4809b82b' 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
8c51fac1b6
Merge commit 'e7698cb4ab17ac9eebbaef64b29f8cb9772a5478' into glitch-soc/merge-upstream
2023-09-15 21:39:21 +02:00
Claire
296e8f791e
Merge commit '1efbb6202400d84024e68975c5cedd65efe71a80' into glitch-soc/merge-upstream
2023-09-15 21:06:45 +02:00
Claire
4127a9d9fe
Merge commit 'a8d18668b2dd066e316c8bb0a712dd19911cdd59' into glitch-soc/merge-upstream
2023-09-15 20:57:40 +02:00
Claire
38fe6ecd05
Fix post edits not being forwarded as expected ( #26936 )
2023-09-15 19:54:32 +02:00
Robert R George
6fb81e40fd
Added admin api for managing tags ( #26872 )
2023-09-13 11:22:53 +02:00
jsgoldstein
d97f736733
Add search tests ( #26703 )
2023-09-08 16:17:55 +02:00
Eugen Rochko
15ce240dae
Fix account_id
, max_id
and min_id
params not working in search ( #26847 )
2023-09-08 14:25:00 +02:00
Claire
d45dd56874
Fix performances of profile directory ( #26842 )
2023-09-07 18:55:25 +02:00
Claire
aaa4b77b04
Simplify Account.by_recent_status
and Account.by_recent_sign_in
scopes ( #26840 )
2023-09-07 15:38:11 +02:00
Claire
b6409b51a3
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
bd83df7fd1
Fix moderator rights inconsistencies ( #26729 )
2023-09-06 16:40:19 +02:00
Claire
ef01aa71a9
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-04 18:27:46 +02:00
Eugen Rochko
a93f7392fd
Add in:library
syntax to search ( #26760 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-09-04 17:20:35 +02:00
Christian Schmidt
e51426c1dc
Fix invalid Content-Type header for WebP images ( #26773 )
2023-09-04 09:46:33 +02:00
Claire
78a851ae0a
Merge commit '1b7b338d0a8fd34824aed80327d62526da9c5eac' into glitch-soc/merge-upstream
2023-09-02 15:02:29 +02:00
Claire
f3f3294db5
Fix test failures due to different default settings in glitch-soc
2023-09-02 14:24:47 +02:00
Claire
432bd89f72
Merge commit '20913b52bb192a9525b3da53a1d25c816a4a177d' 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
a9fb03b6c0
Merge commit 'e1b0d6bbe590b1d4f7bc90a528eeb20d89c499b7' into glitch-soc/merge-upstream
2023-09-02 12:02:23 +02:00
Claire
52ce0a1c1d
Merge commit 'c833282412b5dec6999fa76ac74cd8ba8a0394c5' into glitch-soc/merge-upstream
2023-09-02 11:41:40 +02:00
Claire
97238e3496
Add admin notifications for new Mastodon versions ( #26582 )
2023-09-01 17:47:07 +02:00
Eugen Rochko
1f57ff8dd1
Fix unmatched quotes and prefixes causing search to fail ( #26701 )
2023-09-01 09:43:12 +02:00
Daniel M Brasil
8ad87eeb93
Fix /api/v1/timelines/tag/:hashtag
allowing for unauthenticated access when public preview is disabled ( #26237 )
2023-08-31 13:53:24 +02:00
Tyler Deitz
a50d3d877f
Add avatar image to webfinger responses ( #26558 )
2023-08-31 13:46:27 +02:00
Eugen Rochko
bafa60f5b9
Fix bad search type heuristic ( #26673 )
2023-08-28 17:08:37 +02:00
Claire
a9a06f5ffe
Add PublicStatusesCheck to Elasticsearch index check on admin dashboard ( #26650 )
2023-08-25 12:01:55 +02:00
Claire
a0c46afb82
Merge commit '87a88eefa865f80cf682a7fb45f594fab7c8242a' into glitch-soc/merge-upstream
2023-08-24 21:50:14 +02:00
Claire
17e93dbce5
Merge commit 'b085dcc921497f08e72cb29cf0b5cb07699d9d74' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream re-generated the file, while glitch-soc has a specific ignore
for some file.
Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
Upstream added a plugin, but our files are pretty different.
Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored tests, but part of them were different because
of glitch-soc's theming system.
Applied the refactoring to glitch-soc's change.
2023-08-24 21:26:27 +02:00
Claire
d0a26a2a16
Merge commit 'd4eef922aa794489a027575a560e4b09c68c153e' into glitch-soc/merge-upstream
2023-08-24 21:03:56 +02:00
Claire
1f30778ec6
Merge commit 'd38310bed22bdf2be6ef0e49f325715685b74400' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.jsx`:
Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
Applied the changes there.
2023-08-24 21:01:19 +02:00
jsgoldstein
e82d84469e
Add new public status index ( #26344 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-24 16:40:04 +02:00
Daniel M Brasil
2e58f75da6
Fix timeout on invalid set of exclusionary parameters in /api/v1/timelines/public
( #26239 )
2023-08-23 15:50:23 +02:00
Claire
c52397dea3
Merge commit '8f40a96f28a5cdf5e52c40f57b8adf63165ce6d3' into glitch-soc/merge-upstream
2023-08-22 18:50:14 +02:00
Nick Schonning
7f1b52c55f
Update rubocop and rubocop-rspec ( #26329 )
2023-08-22 09:31:40 +02:00
Claire
0ce3130ef8
Add Elasticsearch cluster health check and indexes mismatch check to dashboard ( #26448 )
2023-08-21 16:50:22 +02:00
Claire
5458629e60
Refactor Api::V1::ProfilesController
into two separate controllers ( #26573 )
2023-08-21 15:47:09 +02:00
Daniel M Brasil
89d2b28e0b
Add ability to delete avatar or header picture via the API ( #25124 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-21 08:44:35 +02:00
Renaud Chaput
f4a6879caf
Allow setting a custom HTTP method in CacheBuster ( #26528 )
...
Co-authored-by: Jorijn Schrijvershof <jorijn@jorijn.com>
2023-08-18 08:18:40 +02:00
Claire
2e66d2562c
Fix cached posts including stale stats ( #26409 )
2023-08-17 16:11:48 +02:00
Claire
33024cca51
Merge commit '13a4a81f022a1b944dd65acb1041dc76093b0901' into glitch-soc/main
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
2023-08-13 18:47:15 +02:00
Claire
6d6acefcc1
Merge commit '788d7a6a2a4582601dd741ad880ef7b775335d14' into glitch-soc/merge-upstream
2023-08-12 09:36:38 +02:00
Claire
32faa7213f
Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
Upstream updated its README, but glitch-soc has a completely different one.
Kept glitch-soc's README
2023-08-11 22:15:41 +02:00
Matt Jankowski
37a9c48429
Avoid connecting to a running ES instance in ES search check spec ( #26413 )
2023-08-09 13:15:04 +02:00
Matt Jankowski
347fc78392
Restore console behavior in test
env ( #26401 )
2023-08-09 11:26:56 +02:00
Claire
ba9ea873c8
Fix blocking subdomains of an already-blocked domain ( #26392 )
2023-08-09 09:39:36 +02:00
Claire
327fe2deaf
Fix list import concurrently creating lists of the same name ( #26372 )
2023-08-07 17:59:20 +02:00
Matt Jankowski
f444c2a206
Spec media attachment speedups ( #25416 )
2023-08-07 17:58:12 +02:00
Christian Schmidt
ecb00fa5ac
Add alt text for preview card thumbnails ( #26184 )
2023-08-03 15:41:51 +02:00
Daniel M Brasil
788d7a6a2a
Add GET /api/v1/instance/languages
to REST API ( #24443 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-03 11:25:47 +02:00
Emelia Smith
e395939ead
Refactor: replace whitelist_mode mentions with limited_federation_mode ( #26252 )
2023-08-02 19:32:48 +02:00