0aa69487a2
Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
Not a real conflict, upstream added a setting textually close to a glitch-soc one.
Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
Not a real conflict, upstream added a setting textually close to a glitch-soc one.
Added upstream's new setting.
- `config/routes.rb`:
Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
an extra route.
Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
This spec got converted to a system spec upstream.
However, the theme setting works differently in glitch-soc, so the spec had been
changed.
Changed the corresponding system spec as well.
2024-12-25 18:01:37 +01:00
f35de1ed0d
Remove un-needed `Poll.attached` scope ( #33368 )
2024-12-20 15:15:11 +00:00
b648c64e2e
Add `NOT NULL` requirement to columns on `polls` ( #33374 )
2024-12-20 14:33:48 +00:00
22caddaa24
Update user role position range limit ( #33349 )
2024-12-19 08:10:39 +00:00
aee64a465c
Remove unused `Poll.unattached` scope ( #33350 )
2024-12-19 08:10:06 +00:00
ca2a7d66b8
Fix missing value limits for `UserRole` position ( #33172 )
2024-12-18 08:29:27 +00:00
978142ac9e
Add missing `NOT NULL` on more columns from "large but valid" tables ( #33330 )
2024-12-17 13:38:18 +00:00
1712543c68
Revert "Support animated PNGs in media attachments ( #28516 )" ( #33334 )
2024-12-17 10:52:59 +00:00
6305b6e747
Fix error decrementing status count when `FeaturedTags#last_status_at` is `nil` ( #33320 )
2024-12-16 12:33:55 +00:00
cf4595967b
Add `NOT NULL` requirement to columns on `account_conversations` ( #33308 )
2024-12-16 08:20:08 +00:00
efc85e39a0
Add missing `NOT NULL` requirement to small, indexed, valid data tables ( #33284 )
2024-12-14 00:16:03 +00:00
3c71ee9b90
Use `touch_all` for time column updates ( #33295 )
2024-12-13 08:41:42 +00:00
a70ae28644
Support animated PNGs in media attachments ( #28516 )
2024-12-11 02:28:21 +00:00
e4e35ab134
Add NOT NULL requirement to account columns on `AccountPin` ( #33244 )
2024-12-10 15:50:49 +00:00
e76aff7de5
Standardize uniqueness validation declaration on `Mention` ( #33247 )
2024-12-10 15:45:13 +00:00
7d52b24569
Add coverage for `AccountPin` model ( #33231 )
2024-12-10 13:02:52 +00:00
30aa0df88c
Add terms of service ( #33055 )
2024-12-09 10:04:46 +00:00
17c02c9210
Remove `thing_type` and `thing_id` columns from settings table ( #31971 )
2024-12-05 14:34:14 +00:00
4934242aca
Update schema/annotations after tag trend db/redis migrate ( #33173 )
2024-12-04 17:55:56 +00:00
48ea7552dd
Change hashtag trends to be stored in the database instead of redis ( #32837 )
...
Co-authored-by: David Roetzel <david@roetzel.de>
2024-12-04 11:59:17 +00:00
e5bea68b20
Fix empty authors preview card serialization ( #33151 )
2024-12-04 09:05:58 +00:00
04b7046be1
Provide option to force use of system scrollbar styling ( #32117 )
2024-12-03 08:38:23 +00:00
c2817c7fad
Merge commit '752d49eefef48262d501ba5fc2006d2c8466a000' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/feed_manager.rb`:
Upstream changed how notifications from follow subscriptions were handled,
refactoring this file in the process.
Conflict is due to glitch-soc having an extra timeline type (direct).
Ported upstream's changes.
- `app/workers/feed_insert_worker.rb`:
Ditto.
2024-12-02 21:08:15 +01:00
a17e7d10fc
Always validate `inbox_url` presence on Relay ( #32364 )
2024-12-02 07:38:06 +00:00
7d52d5df0f
Merge commit 'c58967c3bd7b7eee0b284ee2b77a48ed9ce6863e' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Conflict due to upstream adding fallback support for MathML Core while
glitch-soc supported slightly more tags than upstream.
Added the MathML Core fallback code to glitch-soc.
- `spec/lib/sanitize/config_spec.rb`:
Ditto.
2024-12-01 18:22:00 +01:00
48827e1210
Merge commit 'a27bafa59653328a0f06bedb1dfb2b6ee92af43d' into glitch-soc/merge-upstream
...
- `app/controllers/application_controller.rb`:
Minor conflict due to glitch-soc's theming system.
- `spec/helpers/application_helper_spec.rb`:
Minor conflict due to glitch-soc's theming system.
2024-12-01 17:36:49 +01:00
48f3ed738f
Fix list error messages ( #33082 )
2024-11-28 10:13:06 +00:00
46c43d263c
Change avatar and header size limits from 2MB to 8MB when using libvips ( #33002 )
2024-11-26 21:01:52 +00:00
a27bafa596
Add `UserRole#bypass_block?` method for notification check ( #32974 )
2024-11-26 09:45:47 +00:00
9a7130d6da
Fix direct inbox delivery pushing posts into inactive followers' timelines ( #33067 )
2024-11-25 15:54:18 +00:00
2d8fed23e6
Fix `TagFollow` records not being correctly handled in account operations ( #33063 )
2024-11-25 10:27:58 +00:00
74df47ad9c
Add coverage for `Webhook` validations ( #33026 )
2024-11-25 08:19:16 +00:00
f740611820
Merge commit 'd0753ec276502ea28a1e853cbc6487020a0602e3' into glitch-soc/merge-upstream
2024-11-24 18:56:15 +01:00
6374937147
Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/trends/statuses.rb`:
Upstream added a date restriction to trendable posts, while glitch-soc had
slightly different conditions.
Added the date restriction to glitch-soc's conditions.
2024-11-24 16:46:28 +01:00
d75088d699
Fix pushing hashtag-followed posts to feeds of inactive users ( #33018 )
2024-11-22 08:30:57 +00:00
e68b26c8df
Fix posts made in the future being allowed to trend ( #32996 )
2024-11-20 12:41:22 +00:00
37f00fb018
Use hash arguments to `group` when possible ( #32916 )
2024-11-19 10:36:02 +00:00
2b5faa2ba3
Change lists to reflect added and removed users retroactively ( #32930 )
2024-11-19 10:04:12 +00:00
f2976ec9a4
Extract `Notification::Groups` concern ( #32968 )
2024-11-19 10:02:01 +00:00
da826fe959
Use hash arguments to `order` when possible (Rails 7.2) ( #32915 )
2024-11-18 15:07:53 +00:00
477412d62a
Use hash arguments to `select` when possible (Rails 7.2) ( #32917 )
2024-11-18 14:58:45 +00:00
1c6f53e70f
Use `with_options` blocks in `Associations` concern ( #32840 )
2024-11-18 08:07:18 +00:00
4f1242964b
Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream
2024-11-15 18:44:32 +01:00
319109029d
Fix logic in "last used at per application" oauth token list ( #32912 )
2024-11-15 15:52:37 +00:00
34d7c9edae
Rails 7+: primary_abstract_class recommendation ( #32909 )
2024-11-15 15:37:30 +00:00
766358e52b
Add coverage for malformed version cleanup in `SoftwareUpdateCheckService`, add helper query methods ( #32876 )
2024-11-14 14:03:57 +00:00
62d65504f6
Add `DomainResource` class to wrap MX lookup/normalize ( #32864 )
2024-11-14 13:47:29 +00:00
8f5cbf5370
Fix list creation limit check ( #32869 )
2024-11-13 10:22:11 +00:00
5d9dde3ec0
Add age/expiry duration constants to `BulkImport` class ( #32839 )
2024-11-12 08:57:06 +00:00
a34edc211f
Add audit logging to Relays ( #32819 )
2024-11-12 08:35:08 +00:00
Claire