Claire
946bd2e7e1
Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream
2024-05-01 19:16:48 +02:00
Claire
6f342a6d4c
Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Conflict caused by our different theme systems.
Ported upstream's changes.
- `app/models/account.rb`:
Upstream basically made a change we already made.
Moved constant declaration to match upstream.
2024-05-01 18:56:48 +02:00
Claire
9ce82a35cb
Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream
2024-05-01 18:42:26 +02:00
Claire
555e33a392
Merge commit 'b61ae28f8d4b6f269f50a05c3e65ec7f2c846d32' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Conflict because of our different theming systems.
Updated accordingly, along with `app/helpers/theme_helper.rb`
and `app/helpers/theme_helper_spec.rb`.
2024-05-01 18:38:55 +02:00
Claire
0fb469e2f3
Merge commit '52ab8a59c6e77b6409a7d4d81b15751732b3af91' into glitch-soc/merge-upstream
2024-05-01 17:30:52 +02:00
Claire
15f6d2d038
Merge commit 'd27eb181f6ab419d1745a1fe9b94094be17a618f' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
Conflict due to glitch-soc having a different default site name.
Updated the tests as upstream did, keeping glitch-soc's default name.
2024-05-01 17:22:02 +02:00
Claire
2c386d4cfe
Merge commit 'c70c39cad03824c64564fa7d241e6bf01acbab76' into glitch-soc/merge-upstream
2024-05-01 17:06:49 +02:00
Claire
d52263e0e3
Merge commit '143d9553fa0187b9950a802cdedaea5c8cd12f75' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream updated dependencies textually close to a glitch-soc-only dependency.
Updated the dependencies as well.
2024-05-01 17:04:33 +02:00
Claire
7b46517c38
Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream
2024-05-01 14:31:14 +02:00
Claire
7208edbd37
Replace use_pack, layouts/theme and @theme by new helpers
...
Packs are now loaded from views, just like upstream, and are
identified by their filenames. The definition of `theme.yml` has
changed as such:
- `pack_directory` is now required
- `pack` is now unused
- `signed_in_preload` has been introduced
2024-04-28 15:45:42 +02:00
Matt Jankowski
7fed4a9740
Pull out repeated setup to shared setup in statusus/show view spec ( #29927 )
2024-04-15 15:24:31 +00:00
Matt Jankowski
61d108f415
Extract header_tags method in statuses/show view spec ( #29907 )
2024-04-12 09:50:46 +00:00
Matt Jankowski
da6b9238f5
Expand coverage for admin/metrics/measure/* classes ( #29914 )
2024-04-12 09:38:24 +00:00
Matt Jankowski
ec5a0e0f5e
Expand coverage for admin/metrics/dimension/* classes ( #29913 )
2024-04-12 09:18:35 +00:00
Matt Jankowski
449f99e168
Fix repeated concat output buffer duplicating layout markup ( #29918 )
2024-04-11 23:37:07 +00:00
Matt Jankowski
576554b19b
Use fabrication sequence in domain values ( #29895 )
2024-04-11 08:59:01 +00:00
Matt Jankowski
285f63c02e
Use composable query in User.active scope ( #29775 )
2024-04-08 13:53:49 +00:00
Claire
babbf6017d
Remove caching in cache_collection ( #29862 )
2024-04-08 13:46:13 +00:00
Claire
1d1c3a808a
Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream removed a setting textually adjacent to a glitch-soc-only setting.
Removed the setting glitch-soc removed.
2024-04-06 21:01:40 +02:00
Claire
777984faeb
Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream
2024-04-06 20:34:07 +02:00
Claire
903dc53522
Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream
2024-04-06 20:01:25 +02:00
Claire
67842ffb22
Merge commit '01464074c91f9b7a720928fc4ee912be3d8002d2' into glitch-soc/merge-upstream
2024-04-06 19:54:11 +02:00
Claire
f2b23aa5f3
Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream
...
Conflicts:
- `config/navigation.rb`:
Upstream added a navigation item while glitch-soc had an additional one.
Ported upstream changes.
2024-04-06 19:35:21 +02:00
Claire
e73cf356d2
Move OAuth flow tests from feature tests to system tests ( #29837 )
2024-04-05 16:52:05 +00:00
Matt Jankowski
b61ae28f8d
Separate methods for theme style and meta color tags ( #29802 )
2024-04-05 09:52:43 +00:00
Matt Jankowski
59da591d13
Improve spec for dimension/languages admin metric ( #29842 )
2024-04-05 08:54:11 +00:00
Claire
38b9d31f63
Improve email address validation ( #29838 )
2024-04-05 07:48:45 +00:00
Claire
1f11aa5f04
Add stub for trending tags in user mailer spec ( #29850 )
2024-04-05 07:48:07 +00:00
Matt Jankowski
191bf5876e
Add coverage for sanitize failure path in api/web/embeds spec ( #29851 )
2024-04-04 16:07:16 +00:00
Matt Jankowski
f87959ab50
Fix RSpec/LetSetup cop in api/v1/timelines/public spec ( #28972 )
2024-04-02 14:05:02 +00:00
Matt Jankowski
34489591ec
Add max_pinned_statuses to instances serializer and api response ( #29441 )
2024-04-02 13:54:11 +00:00
Renaud Chaput
b4d991adaa
Use integers and not numbers in notification policy API counters ( #29810 )
2024-04-02 10:06:26 +00:00
renovate[bot]
589e34d00c
Update dependency selenium-webdriver to v4.19.0 ( #29776 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-04-02 08:53:44 +00:00
Claire
9c24f2d6b1
Undo notification permissions on individual and domain blocks ( #29570 )
2024-03-26 14:46:38 +00:00
Claire
81a04ac25c
Improve specs for severed relationships ( #29688 )
2024-03-22 16:25:36 +00:00
Matt Jankowski
34f293475e
Fix results/query in api/v1/featured_tags/suggestions ( #29597 )
2024-03-22 15:08:27 +00:00
Claire
05eda8d193
Remove severed relationship notifications for single account suspensions ( #29700 )
2024-03-21 21:53:24 +00:00
Claire
814a48517f
Add some more tests for notification policies ( #29698 )
2024-03-21 16:46:38 +00:00
Claire
7434c9c276
Fix the relationships controller spec, since it requires an extra model now ( #29671 )
2024-03-21 08:28:37 +00:00
Claire
c0aade79b0
Merge commit '8a1423a47425dd67615e94bdfd13d64b53676da4' into glitch-soc/merge-upstream
2024-03-20 18:31:09 +01:00
Claire
44bf7b8128
Add notifications of severed relationships ( #27511 )
2024-03-20 15:37:21 +00:00
Claire
8a1423a474
Allow unblocking email addresses from any matching account ( #29305 )
2024-03-20 14:38:00 +00:00
Claire
876aa35350
Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream updated a dependency that is on an adjacent line to a
glitch-soc-only dependency in that file.
Updated as upstream did.
- `yarn.lock`:
Upstream updated a dependency that is on an adjacent line to a
glitch-soc-only dependency in that file.
Updated as upstream did.
2024-03-19 19:21:12 +01:00
Matt Jankowski
6d2986017e
Remove unused active_nav_class helper method ( #29617 )
2024-03-18 13:24:59 +00:00
Claire
d5063072c3
Revert friends-of-friends follow recommendation query to using a CTE ( #29619 )
2024-03-18 12:57:21 +00:00
Matt Jankowski
92855948a0
Remove unused show_landing_strip? helper method ( #29618 )
2024-03-18 08:55:54 +00:00
Matt Jankowski
ecdbf15ebe
Remove unused link_to_older and link_to_newer helper methods ( #29620 )
2024-03-18 08:54:46 +00:00
Claire
b8f476256e
Merge commit 'd702a03a0c35fc631a0fa456532946e6751cbbfd' into glitch-soc/merge-upstream
2024-03-15 22:48:04 +01:00
Matt Jankowski
4f4132f1a1
Add diagnostic message for failure during CLI search deploy ( #29462 )
2024-03-15 14:26:23 +00:00
Claire
2e49bc97b0
Merge commit '7720c684c5bf54e73e8815defe15473777d1c201' into glitch-soc/merge-upstream
2024-03-15 12:20:32 +01:00
