19fa4cfcf2
Merge commit '3178acc5cb8415a72b646dbe77be05255d3966f3' into glitch-soc/merge-upstream
2025-01-23 13:38:23 +01:00
e380e803a8
Order emoji categories (in admin interface) by name ( #33630 )
2025-01-22 08:31:51 +00:00
297eb7c956
Merge commit '4bd969e4bb54297981d385903bf8a4348b394f09' into glitch-soc/merge-upstream
...
Conflicts:
- `CONTRIBUTING.md`:
Upstream modified it while we quote upstream's within an otherwise different file.
Applied upstream's changes.
2025-01-18 12:42:17 +01:00
a3baae0b99
API for updating attribution domains ( #32730 )
2025-01-17 08:18:55 +00:00
f6a0cd9d1a
Merge commit 'da4e55eb17e459fbc6d1a19fac3303508324324c' into glitch-soc/merge-upstream
2025-01-16 11:16:53 +01:00
3db8498903
Fix `Style/MutableConstant` cop ( #33602 )
2025-01-16 09:09:06 +00:00
ad71a8d1f7
Merge commit 'c20824fa760061cf8fba258dbbd6b0a615df4749' into glitch-soc/merge-upstream
2025-01-15 19:32:04 +01:00
ab152ebed4
Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Upstream refactored `visibility` handling to a concern, while glitch-soc had
custom code adjacent to some of the changed lines.
Applied upstream's changes.
- `lib/mastodon/version.rb`:
Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's
default github repository had been modified.
Applied upstream's changes and updated `config/mastodon.yml` accordingly.
2025-01-14 20:38:32 +01:00
68c9f91ccb
Treat non-null but blank account domain as local ( #33576 )
2025-01-14 17:40:55 +00:00
50013b10a5
Add `Status::Visibility` concern to hold visibility logic ( #33578 )
2025-01-14 14:32:57 +00:00
4a2813158d
Add support for standard webpush ( #33528 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2025-01-14 09:14:00 +00:00
77a44e61a8
Add enum validation to `DomainBlock#severity` ( #29158 )
2025-01-13 16:05:24 +00:00
f9451c5614
Fix issue with trending order when user has chosen languages ( #33557 )
2025-01-13 14:27:30 +00:00
0db7558822
Fix HTTP 500 on `POST /api/v1/admin/ip_blocks` ( #29308 )
2025-01-13 13:50:58 +00:00
22c1b6f3ee
Fix `Invite#code` changing value on every save ( #33550 )
2025-01-10 20:34:18 +00:00
155dc4bc4b
Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream
...
Conflicts:
- `CONTRIBUTING.md`:
Upstream changed the file, while we had a different one.
Updated the common parts.
- `README.md`:
Upstream changed the file, while we had a different one.
Updated the common parts.
- `app/helpers/application_helper.rb`:
Upstream added helpers where glitch-soc had extra ones.
Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
Upstream added some custom handling of one setting, while
glitch-soc had additional code.
Ported upstream's code.
- `lib/mastodon/version.rb`:
Upstream moved some things to `config/mastodon.yml`.
Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
I don't know honestly.
2025-01-10 20:41:36 +01:00
4f6edc7596
Use `in_order_of` in `trends/*` classes ( #33531 )
2025-01-10 09:33:07 +00:00
4fb3dc0363
Extract `CSS_COLORS` constant for `UserRole` regex validation ( #33532 )
2025-01-10 09:02:48 +00:00
f98972e4eb
Use `with_options` for Account `if: :local?` validation group ( #33529 )
2025-01-10 09:00:31 +00:00
54e2030146
Add `AccountWarning#appeal_eligible?` method ( #33526 )
2025-01-09 15:08:39 +00:00
9b8d1fb6d1
Add `Account#actor_type_application?` query method ( #33525 )
2025-01-09 14:32:48 +00:00
c6c8e7e6ab
Fix last paginated notification group only including data on a single notification ( #33271 )
2025-01-09 13:47:12 +00:00
f22a2aab40
Add `Account#remote?` query method ( #33508 )
2025-01-08 14:28:08 +00:00
c0264c8013
Extend custom CSS cache time with digest paths ( #33207 )
2025-01-08 08:48:45 +00:00
7ad44e22ed
Remove role color highlighting from custom css ( #33493 )
2025-01-07 16:28:35 +00:00
126ce9a232
Merge commit '82d2ce293d98a2b9e024bc5396c3586904d46ae5' into glitch-soc/merge-upstream
2025-01-06 20:36:25 +01:00
ef39398b82
Add `urgent` scope and `by_version` method to `SoftwareUpdate` ( #33470 )
2025-01-06 18:23:57 +00:00
4cf031ee13
Extricate `Invite` constants for code generation ( #33472 )
2025-01-06 18:23:05 +00:00
dbbf450ef5
Fix `fediverse:creator` metadata not showing up in REST API ( #33466 )
2025-01-06 10:04:25 +00:00
08dd11f8d4
Use `in_order_of` with `filter: false` in `AccountSummary.localized` ( #33446 )
2025-01-06 08:18:05 +00:00
3bdfa3eb4c
Added validator for extra profile field values with empty name ( #33421 )
2025-01-04 19:42:27 +00:00
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
Claire