Claire
126ce9a232
Merge commit '82d2ce293d98a2b9e024bc5396c3586904d46ae5' into glitch-soc/merge-upstream
2025-01-06 20:36:25 +01:00
Matt Jankowski
ef39398b82
Add urgent scope and by_version method to SoftwareUpdate ( #33470 )
2025-01-06 18:23:57 +00:00
Matt Jankowski
08dd11f8d4
Use in_order_of with filter: false in AccountSummary.localized ( #33446 )
2025-01-06 08:18:05 +00:00
zunda
f16fbc069a
Use configured limit for number of profile fields ( #33463 )
2025-01-06 04:47:10 +00:00
Tim Rogers
3bdfa3eb4c
Added validator for extra profile field values with empty name ( #33421 )
2025-01-04 19:42:27 +00:00
Claire
68106f250c
Merge commit '6ffa251d6ad239d1ad2b95e784c3a7a21cbf50e8' into glitch-soc/merge-upstream
2025-01-03 12:34:47 +01:00
Matt Jankowski
7cbdcd7b3f
Add role-specific user fabricators ( #33437 )
2025-01-03 08:28:14 +00:00
Claire
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
Matt Jankowski
f35de1ed0d
Remove un-needed Poll.attached scope ( #33368 )
2024-12-20 15:15:11 +00:00
Matt Jankowski
28d309fd86
Add shared example for Expireable concern ( #33369 )
2024-12-20 08:21:34 +00:00
Matt Jankowski
22caddaa24
Update user role position range limit ( #33349 )
2024-12-19 08:10:39 +00:00
Matt Jankowski
aee64a465c
Remove unused Poll.unattached scope ( #33350 )
2024-12-19 08:10:06 +00:00
Matt Jankowski
ca2a7d66b8
Fix missing value limits for UserRole position ( #33172 )
2024-12-18 08:29:27 +00:00
Matt Jankowski
0085e8c427
Wrap assertions in change within AccountStatusesCleanupPolicy spec ( #33335 )
2024-12-17 16:25:02 +00:00
Claire
1712543c68
Revert "Support animated PNGs in media attachments ( #28516 )" ( #33334 )
2024-12-17 10:52:59 +00:00
Matt Jankowski
1bd9306ced
Add coverage for Tag model validations on name/display_name ( #33291 )
2024-12-13 09:21:55 +00:00
Matt Jankowski
4bf6af3b61
Remove unused model_have_error_on_field matcher ( #33273 )
2024-12-12 10:28:05 +00:00
Matt Jankowski
b51e0bc3c7
Simplify model validation specs for Report ( #33267 )
2024-12-12 09:09:35 +00:00
Matt Jankowski
ad68686bec
Simplify model validation specs for CustomFilter ( #33248 )
2024-12-11 09:55:35 +00:00
Matt Jankowski
f6daf73286
Add non-matching cases to Report#history spec ( #33253 )
2024-12-11 08:24:50 +00:00
Christian Schmidt
a70ae28644
Support animated PNGs in media attachments ( #28516 )
2024-12-11 02:28:21 +00:00
Matt Jankowski
e76aff7de5
Standardize uniqueness validation declaration on Mention ( #33247 )
2024-12-10 15:45:13 +00:00
Matt Jankowski
7d52b24569
Add coverage for AccountPin model ( #33231 )
2024-12-10 13:02:52 +00:00
Eugen Rochko
30aa0df88c
Add terms of service ( #33055 )
2024-12-09 10:04:46 +00:00
Eugen Rochko
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
Matt Jankowski
be43b01eb1
Add coverage for CustomFilter#expires_in method ( #33142 )
2024-12-02 21:52:17 +00:00
Matt Jankowski
2381ed55d7
Add coverage for Report#unresolved_siblings? ( #33141 )
2024-12-02 21:52:12 +00:00
Claire
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
Matt Jankowski
3cd308523a
Add shared example for RankedTrend concern ( #33125 )
2024-12-02 00:44:14 +00:00
Claire
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
Matt Jankowski
74df47ad9c
Add coverage for Webhook validations ( #33026 )
2024-11-25 08:19:16 +00:00
Matt Jankowski
ab9c62e8c7
Add coverage for User validations ( #33028 )
2024-11-25 08:18:10 +00:00
Matt Jankowski
fd90f04f0e
Add coverage for UserRole validations ( #33029 )
2024-11-25 08:18:07 +00:00
Claire
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
Matt Jankowski
b66fbaeec2
Add AccountWarning case to Report#history spec ( #32984 )
2024-11-20 07:52:00 +00:00
Eugen Rochko
2b5faa2ba3
Change lists to reflect added and removed users retroactively ( #32930 )
2024-11-19 10:04:12 +00:00
Matt Jankowski
87e7ad9b8f
Add LoginActivity model spec and BrowserDetection concern shared example ( #32959 )
2024-11-19 09:15:05 +00:00
Matt Jankowski
03ee08c2da
Use nil instead of false for datetime value in spec ( #32926 )
2024-11-18 09:31:25 +00:00
Matt Jankowski
be413d67de
Form::Import spec reduce factories (#32924 )
2024-11-18 09:22:09 +00:00
Claire
4f1242964b
Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream
2024-11-15 18:44:32 +01:00
Matt Jankowski
319109029d
Fix logic in "last used at per application" oauth token list ( #32912 )
2024-11-15 15:52:37 +00:00
Matt Jankowski
766358e52b
Add coverage for malformed version cleanup in SoftwareUpdateCheckService, add helper query methods ( #32876 )
2024-11-14 14:03:57 +00:00
Claire
8f5cbf5370
Fix list creation limit check ( #32869 )
2024-11-13 10:22:11 +00:00
Matt Jankowski
884bbf7ae2
Prepare the way for banning a bunch of usernames ( #32856 )
2024-11-12 15:43:55 +00:00
Matt Jankowski
5d9dde3ec0
Add age/expiry duration constants to BulkImport class ( #32839 )
2024-11-12 08:57:06 +00:00
Matt Jankowski
c78dc23b49
Move account sensitize-related methods to concern ( #28865 )
2024-11-11 13:08:23 +00:00
Matt Jankowski
d033920b7e
Move account silence-related methods to concern ( #28866 )
2024-11-11 08:29:55 +00:00
Claire
f0f807cec7
Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream
2024-11-10 13:18:43 +01:00
Claire
2bea74e69d
Avoid latest featured tag use on post removal unless necessary ( #32787 )
2024-11-06 10:51:54 +00:00
Claire
f624ef2778
Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/formatting_helper.rb`:
Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
Wrapped the modified code.
2024-11-03 20:51:58 +01:00
