Matt Jankowski
1820bad646
Fix Performance/StringIdentifierArgument
cop ( #28399 )
2023-12-18 10:26:09 +00:00
Matt Jankowski
0e5b8fc46b
Fix Style/RedundantReturn
cop ( #28391 )
2023-12-18 09:50:51 +00:00
Claire
4113fbf6e8
Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream enforced new code style rules, where we had different code.
Applied the new code style rules.
2023-12-17 23:04:16 +01:00
Claire
1474318691
Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main
...
Conflicts:
- `app/models/trends/statuses.rb`:
Upstream fixed a bug in the trending post condition.
Glitch-soc's condition is different because we potentially allow CWed content
to trend.
Ported upstream's fix while keeping glitch-soc's change.
- `config/initializers/content_security_policy.rb`:
Kept our version for now, we will switch to upstream later down the road.
2023-12-17 15:32:29 +01:00
Matt Jankowski
b1dec09d20
Fix Style/InverseMethods
cop ( #28377 )
2023-12-15 15:52:00 +00:00
Claire
dcc24db793
Fix N+1s because of association preloaders not actually getting called ( #28339 )
2023-12-13 07:47:32 +00:00
Claire
9f92b05bd2
Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated their README but we have a completely different one.
Kept our version of `README.md`
2023-12-10 18:05:02 +01:00
Matt Jankowski
3918dc68c7
Use composite primary key for PreviewCardsStatus
model ( #28208 )
2023-12-07 14:49:05 +00:00
Matt Jankowski
5631f139c1
Fix Lint/SymbolConversion
cop ( #28175 )
2023-12-01 15:53:35 +00:00
Matt Jankowski
d83d01eb1e
Fix Lint/RedundantSafeNavigation
cop ( #28172 )
2023-12-01 15:52:56 +00:00
Matt Jankowski
f70f39dd04
Add explicit dependent: nil
to associations ( #28169 )
2023-12-01 15:52:47 +00:00
Matt Jankowski
440b80b2e7
Model concerns organization into module namespaces ( #28149 )
2023-12-01 11:00:41 +00:00
Claire
963354978a
Add Account#unavailable?
and Account#permanently_unavailable?
aliases ( #28053 )
2023-11-30 15:43:26 +00:00
Matt Jankowski
bb0efe16e6
Remove default_scope
from MediaAttachment
class ( #28043 )
2023-11-30 13:30:35 +00:00
Matt Jankowski
e48ecd2929
Remove default_scope
from Admin::ActionLog
( #28026 )
2023-11-29 10:39:59 +00:00
Matt Jankowski
186895fc88
Refactor, lint fix, and bug fix on admin/roles/form partial ( #27558 )
2023-11-29 10:00:52 +00:00
Kouhai
78a9906dfe
Merge remote-tracking branch 'glitch/main' ( a21fe8687e
)
2023-11-27 22:59:37 -08:00
Claire
3a24754229
Change GIF max matrix size error to explicitly mention GIF files ( #27927 )
2023-11-24 09:31:28 +00:00
Matt Jankowski
4be12791e6
Remove default_scope
from StatusEdit
class ( #28042 )
2023-11-23 09:26:11 +00:00
Eugen Rochko
cdc57c74b7
Fix unsupported time zone or locale preventing sign-up ( #28035 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-11-22 11:38:07 +00:00
Matt Jankowski
d2aacea8da
Reduce .times
usage in AccountSearch spec, use constant for default limit ( #27946 )
2023-11-20 09:08:22 +00:00
ppnplus
2b038b4f89
Added Thai diacritics and tone marks in HASHTAG_INVALID_CHARS_RE ( #26576 )
2023-11-14 15:33:59 +00:00
Matt Jankowski
b7807f3d84
Use normalizes
to prepare Webhook#events
value ( #27605 )
2023-11-13 22:47:44 +00:00
Eugen Rochko
0d14fcebae
Change link previews to keep original URL from the status ( #27312 )
2023-11-13 09:58:28 +00:00
Matt Jankowski
45770c9306
Fix Performance/MapMethodChain
cop ( #27744 )
2023-11-07 13:01:09 +00:00
Matt Jankowski
bbad5b6456
Remove false positive cop detection ( #27457 )
2023-11-07 10:44:15 +00:00
Claire
6c52f8286b
Fix posts from force-sensitized accounts being able to trend ( #27620 )
2023-10-30 22:32:25 +00:00
Claire
93e4cdc31b
Fix hashtag matching pattern matching some URLs ( #27584 )
2023-10-27 14:04:51 +00:00
Matt Jankowski
12550a6a28
Use Rails.env.local?
shorthand method to check env ( #27519 )
2023-10-26 21:20:41 +00:00
Claire
4ef66d6538
Merge commit '15182d1e5e595b21c47b48c5d258f30a0251e753' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
glitch-soc had extra ignores.
Removed them.
2023-10-24 20:31:20 +02:00
Claire
4b0fb764c3
Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream
...
Conflicts and ported changes:
- updated `@rails/ujs` imports
2023-10-24 19:59:19 +02:00
Claire
57c0de949b
Merge commit '8b770ce8110e6cd609a6769c66210d95e291e3e5' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream changed how asset host CSP directives are used, and glitch-soc has
a pretty different CSP file.
It may be worth reconsidering the differences between upstream and glitch-soc
but for now, just port the change.
2023-10-24 19:17:20 +02:00
Claire
787d5ad386
Merge commit 'bcae7442757845191c0e82b61cd1d0cd3ca860d1' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Caused by a glitch-soc-only dependency (`exif-js`).
Kept it.
2023-10-24 19:05:18 +02:00
Claire
b0c76eaadd
Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream changed one import, close to a glitch-soc-only import to handle
different max character counts.
Ported upstream's change.
2023-10-24 18:41:20 +02:00
Matt Jankowski
714e3ae5b5
Use Rails 7.1 normalizes
feature ( #27521 )
2023-10-24 10:06:10 +00:00
Matt Jankowski
e93a75f1a1
Rails 7.1 update ( #25963 )
2023-10-23 17:58:29 +00:00
Claire
8b770ce811
Add warnings to report action logs ( #27425 )
2023-10-23 14:30:46 +02:00
Claire
bcae744275
Fix some link anchors being recognized as hashtags ( #27271 )
2023-10-23 14:19:38 +02:00
Matt Jankowski
b0213472df
Validate allowed schemes on preview card URLs ( #27485 )
2023-10-23 09:50:02 +02:00
kouhai
b24d7bb6f2
th: Merge remote-tracking branch 'glitch/main' ( 18eacc7a07
)
2023-10-22 16:36:39 -07:00
kouhai
1288d4c9b6
th: Merge remote-tracking branch 'glitch/main' ( 5efa6ac771
)
2023-10-22 16:15:44 -07:00
Claire
74fd46d3ab
Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream
2023-10-19 19:14:04 +02:00
Matt Jankowski
63a2a4b074
Fix Performance/DeletePrefix
cop ( #27448 )
2023-10-18 10:32:09 +02:00
Claire
c10a667ac2
Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream
2023-10-17 21:42:49 +02:00
Matt Jankowski
08a376cbcb
Fix Style/CombinableLoops
cop ( #27429 )
2023-10-16 16:36:28 +02: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
d7fcd70023
Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/cors.rb`:
Upstream refactored this file, and glitch-soc had local changes.
I could not find the rationale for the glitch-soc changes, so I
used upstream's version.
2023-10-08 16:41:56 +02:00
Claire
19ebf7797e
Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream
2023-10-08 16:30:00 +02:00
Claire
340c390849
Fix crash when filtering for “dormant” relationships ( #27306 )
2023-10-06 12:58:16 +02:00
Matt Jankowski
c676bc91e9
Dont match mention in url query string ( #25656 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-03 17:01:45 +02:00
Matt Jankowski
2016c5d912
Fix deprecation warning about rewhere: true
being default behavior (Rails 7.1 prep) ( #27190 )
2023-09-28 16:52:23 +02:00
Matt Jankowski
3060bfa4bd
Extract filename and csv helper methods from Form::Import
( #26129 )
2023-09-28 16:22:05 +02:00
Claire
686406cc2d
Fix filtering audit log for entries about disabling 2FA ( #27186 )
2023-09-28 13:41:24 +02:00
Claire
abdb58840a
Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream
2023-09-26 13:13:27 +02:00
Essem
bd810391d6
Properly remove tIME chunk from PNG uploads ( #27111 )
2023-09-25 19:21:07 +02:00
Claire
1bd7455d81
Fix inefficient queries in “Follows and followers” as well as several admin pages ( #27116 )
2023-09-25 15:06:43 +02:00
Claire
39da3d86f8
Fix ActiveRecord using two connection pools when no replica is defined ( #27061 )
2023-09-22 16:01:59 +02:00
Kouhai
9d32bdbcde
th: Merge remote-tracking branch 'glitch/main'
2023-09-16 20:35:31 -07: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
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
5ed72f668f
Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream
2023-09-15 21:39:21 +02:00
Claire
8c51fac1b6
Merge commit 'e7698cb4ab17ac9eebbaef64b29f8cb9772a5478' into glitch-soc/merge-upstream
2023-09-15 21:39:21 +02:00
Claire
08b495d95c
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
2023-09-15 21:06:45 +02:00
Claire
296e8f791e
Merge commit '1efbb6202400d84024e68975c5cedd65efe71a80' 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
4127a9d9fe
Merge commit 'a8d18668b2dd066e316c8bb0a712dd19911cdd59' into glitch-soc/merge-upstream
2023-09-15 20:57:40 +02:00
Claire
e4f5114aaf
Fix obsolete cache key in status cache invalidation logic ( #26934 )
2023-09-15 19:52:28 +02:00
Claire
4c9f14229f
Fix obsolete cache key in status cache invalidation logic ( #26934 )
2023-09-15 19:52:28 +02:00
Eugen Rochko
fc6825055b
Change score half-life for trending posts from 2 hours to 1 hour ( #26915 )
2023-09-14 09:20:14 +02:00
Eugen Rochko
3bb91e79f0
Change score half-life for trending posts from 2 hours to 1 hour ( #26915 )
2023-09-14 09:20:14 +02:00
Robert R George
20666482ef
Added admin api for managing tags ( #26872 )
2023-09-13 11:22:53 +02:00
Robert R George
6fb81e40fd
Added admin api for managing tags ( #26872 )
2023-09-13 11:22:53 +02:00
Claire
81caafbe84
Fix performances of profile directory ( #26842 )
2023-09-07 18:55:25 +02:00
Claire
d45dd56874
Fix performances of profile directory ( #26842 )
2023-09-07 18:55:25 +02:00
Claire
355e3fb529
Simplify Account.by_recent_status
and Account.by_recent_sign_in
scopes ( #26840 )
2023-09-07 15:38:11 +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
Colette Kerr
8a9d7aeb1e
Change DCT method used for JPEG encoding to float ( #26675 )
2023-09-07 05:26:25 +02:00
Colette Kerr
e8427d32cb
Change DCT method used for JPEG encoding to float ( #26675 )
2023-09-07 05:26:25 +02:00
Claire
b83e487502
Fix moderator rights inconsistencies ( #26729 )
2023-09-06 16:40:19 +02:00
Claire
bd83df7fd1
Fix moderator rights inconsistencies ( #26729 )
2023-09-06 16:40:19 +02:00
Claire
77caba3789
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-05 20:34:17 +02:00
Claire
3582239913
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
96f51d6c1f
Fix “Scoped order is ignored, it's forced to be batch order.” warnings ( #26793 )
2023-09-05 15:37:23 +02:00
Claire
c107512fa6
Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream
2023-09-02 15:02:29 +02:00
Claire
78a851ae0a
Merge commit '1b7b338d0a8fd34824aed80327d62526da9c5eac' into glitch-soc/merge-upstream
2023-09-02 15:02:29 +02:00
Claire
4ed629cd7e
Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/form/admin_settings.rb`:
Upstream added the notion of overriden settings, while we had extra code for
pseudo-settings (only used to combine flavour and skin in a single select
field).
Ported upstream changes.
- `config/i18n-tasks.yml`:
Upstream added `simple_form.overridden` to `ignore_unused`,
we had `simple_form.glitch_only`.
Added `simple_form.glitch_only` as well.
2023-09-02 14:44:47 +02:00
Claire
63969b15b3
Merge commit '8bffce5f015ace5b73d5a8aa746c02e374d927bb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/form/admin_settings.rb`:
Upstream added the notion of overriden settings, while we had extra code for
pseudo-settings (only used to combine flavour and skin in a single select
field).
Ported upstream changes.
- `config/i18n-tasks.yml`:
Upstream added `simple_form.overridden` to `ignore_unused`,
we had `simple_form.glitch_only`.
Added `simple_form.glitch_only` as well.
2023-09-02 14:44:47 +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
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
ffb486648c
Merge commit 'cb9f96036cf78835e22aafb30b80717b5a8b7394' into glitch-soc/merge-upstream
2023-09-02 13:34:54 +02:00
Claire
d38116d584
Merge commit 'e26e4702acadc05fca8bb550f98b4186b04d335d' into glitch-soc/merge-upstream
2023-09-02 13:34:54 +02:00
Claire
fbbe9f1c12
Merge commit 'a7d96e6affd4a2da65f09f3f4ffa1b9350bb9a42' into glitch-soc/merge-upstream
2023-09-02 12:20:33 +02:00
Claire
1ef0758cf0
Merge commit 'f8b5f05d440796970b761dafb4bfea1784884ecf' into glitch-soc/merge-upstream
2023-09-02 12:20:33 +02:00
Claire
c8aa3d6d06
Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream
2023-09-02 12:02:23 +02:00
Claire
a9fb03b6c0
Merge commit 'e1b0d6bbe590b1d4f7bc90a528eeb20d89c499b7' into glitch-soc/merge-upstream
2023-09-02 12:02:23 +02:00
Claire
3c7dbf3a16
Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream changed the environment variables used for defining the version
number. This change occurs close to lines that were modified in glitch-soc
to account for the different repositories to push to.
Ported upstream changes.
- `.github/workflows/build-push-pr.yml`:
Upstream changed the environment variables used for defining the version
number. This change occurs close to lines that were modified in glitch-soc
to account for the different repositories to push to.
Ported upstream changes.
- `lib/mastodon/version.rb`:
Upstream changed how the version string is built from environment variables.
Adapted the logic to account for the `+glitch` in glitch-soc.
2023-09-02 11:56:09 +02:00
Claire
ed5d57dac3
Merge commit '4456f65da4da07b37132130d9049c6684d379085' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream changed the environment variables used for defining the version
number. This change occurs close to lines that were modified in glitch-soc
to account for the different repositories to push to.
Ported upstream changes.
- `.github/workflows/build-push-pr.yml`:
Upstream changed the environment variables used for defining the version
number. This change occurs close to lines that were modified in glitch-soc
to account for the different repositories to push to.
Ported upstream changes.
- `lib/mastodon/version.rb`:
Upstream changed how the version string is built from environment variables.
Adapted the logic to account for the `+glitch` in glitch-soc.
2023-09-02 11:56:09 +02:00
Claire
6b7c47311d
Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream
2023-09-02 11:41:40 +02:00
Claire
52ce0a1c1d
Merge commit 'c833282412b5dec6999fa76ac74cd8ba8a0394c5' into glitch-soc/merge-upstream
2023-09-02 11:41:40 +02:00
Eugen Rochko
05093266e6
Fix some video encoding failing due to uneven dimensions ( #26766 )
2023-09-02 09:02:44 +02:00
Eugen Rochko
1b7b338d0a
Fix some video encoding failing due to uneven dimensions ( #26766 )
2023-09-02 09:02:44 +02:00
Claire
16681e0f20
Add admin notifications for new Mastodon versions ( #26582 )
2023-09-01 17:47:07 +02:00
Claire
97238e3496
Add admin notifications for new Mastodon versions ( #26582 )
2023-09-01 17:47:07 +02:00
Claire
9e26cd5503
Add authorized_fetch
server setting in addition to env var ( #25798 )
2023-09-01 15:41:10 +02:00
Claire
7d3930a520
Add authorized_fetch
server setting in addition to env var ( #25798 )
2023-09-01 15:41:10 +02:00
Eugen Rochko
ecd76fa413
Fix videos not playing in some browsers due to unsupported color space ( #26745 )
2023-08-31 17:21:06 +02:00
Eugen Rochko
703178c117
Fix videos not playing in some browsers due to unsupported color space ( #26745 )
2023-08-31 17:21:06 +02:00
Claire
9e77ab7db2
Change private statuses index to index without crutches ( #26713 )
2023-08-29 17:51:13 +02:00
Claire
e5da7a6c53
Change private statuses index to index without crutches ( #26713 )
2023-08-29 17:51:13 +02:00
Eugen Rochko
01b87a1632
Change video compression parameters ( #26631 )
2023-08-28 19:40:08 +02:00
Eugen Rochko
92c9bf731d
Change video compression parameters ( #26631 )
2023-08-28 19:40:08 +02:00
Claire
0cce7fb617
Fix incorrect call to PublicStatusesIndex.import
( #26697 )
2023-08-28 15:04:57 +02:00
Claire
c46d297740
Fix incorrect call to PublicStatusesIndex.import
( #26697 )
2023-08-28 15:04:57 +02:00
Eugen Rochko
5694e24bbf
Fix unnecessary condition causing seqscan when indexing ( #26689 )
2023-08-27 22:37:35 +02:00
Eugen Rochko
4456f65da4
Fix unnecessary condition causing seqscan when indexing ( #26689 )
2023-08-27 22:37:35 +02:00
Kouhai
7c7355a964
th: Merge remote-tracking branch 'glitch/main' ( d033fab0ed
)
2023-08-26 22:00:56 -07:00
Claire
32e67e78a3
Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream
2023-08-24 21:50:14 +02:00
Claire
a0c46afb82
Merge commit '87a88eefa865f80cf682a7fb45f594fab7c8242a' into glitch-soc/merge-upstream
2023-08-24 21:50:14 +02:00
Claire
88ff45a3b2
Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream
2023-08-24 21:03:56 +02:00
Claire
d0a26a2a16
Merge commit 'd4eef922aa794489a027575a560e4b09c68c153e' into glitch-soc/merge-upstream
2023-08-24 21:03:56 +02:00
Claire
1b5d3fdc5e
Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream
2023-08-24 20:55:28 +02:00
Claire
6fba17f6f3
Merge commit 'b4a95b46cd4399420670c8edf1807ad3a6e979ec' into glitch-soc/merge-upstream
2023-08-24 20:55:28 +02:00
jsgoldstein
30c191aaa0
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
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
f337008819
Fix timeout on invalid set of exclusionary parameters in /api/v1/timelines/public
( #26239 )
2023-08-23 15:50:23 +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
452f15be78
Move glitch-soc's “Hide followers count” setting to “Show followers count” under “Privacy and reach” tab
2023-08-22 19:50:37 +02:00
Claire
4e353aa9be
Move glitch-soc's “Hide followers count” setting to “Show followers count” under “Privacy and reach” tab
2023-08-22 19:50:37 +02:00
Claire
10404aece8
Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream
2023-08-22 18:50:14 +02:00
Claire
c52397dea3
Merge commit '8f40a96f28a5cdf5e52c40f57b8adf63165ce6d3' into glitch-soc/merge-upstream
2023-08-22 18:50:14 +02:00
Claire
2126812f65
Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
Upstream moved some settings, where glitch-soc has an extra setting.
Ported upstream changes, moving the same settings as them.
2023-08-22 18:31:28 +02:00
Claire
b6ca020d02
Merge commit 'bd7f631918b3acbecf0c385008389ba22c945dbe' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
Upstream moved some settings, where glitch-soc has an extra setting.
Ported upstream changes, moving the same settings as them.
2023-08-22 18:31:28 +02:00
Claire
9ed0c91a37
Add auto-refresh of accounts we get new messages/edits of ( #26510 )
2023-08-21 16:09:26 +02:00
Claire
b8ca46f568
Add auto-refresh of accounts we get new messages/edits of ( #26510 )
2023-08-21 16:09:26 +02:00
Claire
ee702e36e5
Change follow recommendation materialized view to be faster in most cases ( #26545 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-08-18 18:20:55 +02:00
Claire
b4a95b46cd
Change follow recommendation materialized view to be faster in most cases ( #26545 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-08-18 18:20:55 +02:00
Claire
60b9fa641d
Fix cached posts including stale stats ( #26409 )
2023-08-17 16:11:48 +02:00
Claire
2e66d2562c
Fix cached posts including stale stats ( #26409 )
2023-08-17 16:11:48 +02:00
Claire
cc4560d95b
Change “privacy and reach” settings so that unchecking boxes always increase privacy and checking them always increase reach ( #26508 )
2023-08-17 09:13:26 +02:00
Claire
4b4228c0cd
Change “privacy and reach” settings so that unchecking boxes always increase privacy and checking them always increase reach ( #26508 )
2023-08-17 09:13:26 +02:00
Claire
0446394465
Fix “legal” report category not showing up in moderation interface ( #26509 )
2023-08-16 16:38:33 +02:00
Claire
a19ce425ef
Fix “legal” report category not showing up in moderation interface ( #26509 )
2023-08-16 16:38:33 +02:00
Claire
90ec88d58b
Add support for indexable
attribute on remote actors ( #26485 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-08-14 18:54:51 +02:00
Claire
3c50a91087
Add support for indexable
attribute on remote actors ( #26485 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-08-14 18:54:51 +02:00
Claire
fc5ab2dc83
Add privacy tab in profile settings ( #26484 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-08-14 18:52:45 +02:00
Claire
738b024d0c
Add privacy tab in profile settings ( #26484 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-08-14 18:52:45 +02:00
Claire
6530f9709c
Merge commit '121443c0fca383268b8022c048dd137994785aff' 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
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