777984faeb
Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream
2024-04-06 20:34:07 +02:00
f14b6f3d99
[Glitch] Fix duplicate translation string for severed relationships
...
Port 885d0faf83
2024-04-06 20:31:09 +02:00
903dc53522
Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream
2024-04-06 20:01:25 +02:00
375af259a2
[Glitch] Change back button to always appear in advanced web UI
...
Port be52633ee4
2024-04-06 19:55:13 +02:00
67842ffb22
Merge commit '01464074c91f9b7a720928fc4ee912be3d8002d2' into glitch-soc/merge-upstream
2024-04-06 19:54:11 +02:00
0f966209ca
[Glitch] Add notifications of severed relationships
...
Port 44bf7b8128
2024-04-06 19:38:57 +02:00
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
9451997fa8
Refactor notifications code to reduce differences with upstream ( #2692 )
...
* Merge back `Follow` notification component
* Merge back part of `FollowRequestContainer` notification container
* Reduce differences with upstream in the `mention` case
* Reduce differences with upstream in the `favourite` case
* Reduce differences with upstream in the `reblog` case
* Reduce differences with upstream in the `status` case
* Reduce differences with upstream in the `update` case
* Reduce differences with upstream in the `poll` case
* Merge back `AdminSignup` notification component
* Merge back `AdminReport` notification container
2024-04-06 19:34:30 +02:00
8a64406d34
New Crowdin Translations (automated) ( #2668 )
...
* New Crowdin translations
* Fix bogus translation files
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-04-06 18:18:06 +02:00
119c7aa0df
Update dependency rails-i18n to v7.0.9 ( #29564 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-22 16:22:52 +00:00
58376eedda
Remove obsolete `admin` and `moderator` columns from `users` table ( #29718 )
2024-03-22 16:22:36 +00:00
d71d26a3c9
Reattribute notification-related records if possible when merging accounts ( #29694 )
2024-03-22 16:21:53 +00:00
de6c9e0fcd
Change new modals to allow vertical scrolling ( #29644 )
2024-03-22 16:21:50 +00:00
387c78ddf9
Change icon of severed relationships notifications ( #29712 )
2024-03-22 15:45:04 +00:00
dfa43707eb
Change `AccountRelationshipSeveranceEvent` model to store lost followers and following counts separately ( #29714 )
2024-03-22 15:44:31 +00:00
34f293475e
Fix results/query in `api/v1/featured_tags/suggestions` ( #29597 )
2024-03-22 15:08:27 +00:00
5db5fa879b
New Crowdin Translations (automated) ( #29708 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-22 14:50:03 +00:00
8c1d29df7e
Use `has_many through` instead of `delegate` for ARSE<>SR ( #29672 )
2024-03-22 14:43:35 +00:00
ec1e770fea
Add the role ID to the badge component ( #29707 )
2024-03-22 11:59:35 +00:00
05eda8d193
Remove severed relationship notifications for single account suspensions ( #29700 )
2024-03-21 21:53:24 +00:00
70a8fcf07d
Fix notification policy migration not preserving `filter_private_mentions` correctly ( #29699 )
2024-03-21 21:52:29 +00:00
142c018cfa
Add ruby 3.3 to CI test matrix ( #29705 )
2024-03-21 21:48:41 +00:00
ec6d016da1
Update dependency ox to v2.14.18 ( #29701 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-21 18:09:45 +00:00
7f5e930bd2
Update dependency strong_migrations to v1.8.0 ( #29556 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-21 18:09:26 +00:00
f5444c8fe4
Update dependency rspec-rails to v6.1.2 ( #29691 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-21 18:06:32 +00:00
05abefe989
Update RuboCop (non-major) to v1.62.1 ( #29692 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-21 17:39:27 +00:00
814a48517f
Add some more tests for notification policies ( #29698 )
2024-03-21 16:46:38 +00:00
a59f5694fe
Add empty line after ✨ magic ✨ frozen string comment ( #29696 )
2024-03-21 14:12:50 +00:00
75f34b80a8
Clean up notification requests when deleting accounts ( #29693 )
2024-03-21 14:12:26 +00:00
1df00d4e76
Update dependency pino-pretty to v11 ( #29662 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-21 10:46:14 +00:00
2ec3fcaffe
Update dependency rack to v2.2.9 ( #29685 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-21 10:43:37 +00:00
a506b09de0
Update dependency @reduxjs/toolkit to v2.2.2 ( #29681 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-21 10:41:47 +00:00
1feb228275
Update dependency express to v4.19.1 ( #29663 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-21 10:40:38 +00:00
d13cdced1e
Add Renovate grouped updates for RSpec and RuboCop ( #29621 )
2024-03-21 10:35:12 +00:00
885d0faf83
Fix duplicate translation string for severed relationships ( #29689 )
2024-03-21 10:06:21 +00:00
c007dd5dd2
New Crowdin Translations (automated) ( #29687 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-21 09:57:45 +00:00
77897cd24c
Use existing `SeveredRelationship.about_local_account` scope in more places ( #29673 )
2024-03-21 08:36:49 +00:00
718ee72c80
Use `db_table_exists?` method in new cli/maintenance area ( #29677 )
2024-03-21 08:32:40 +00:00
cdd168f5d3
Update `enum` away from deprecated ( #29678 )
2024-03-21 08:32:35 +00:00
01464074c9
Update dependency autoprefixer to v10.4.19 ( #29682 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-21 08:32:31 +00:00
3f363c61bc
Update dependency postcss to v8.4.38 ( #29684 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-21 08:32:25 +00:00
7434c9c276
Fix the relationships controller spec, since it requires an extra model now ( #29671 )
2024-03-21 08:28:37 +00:00
39bac24cb7
Remove reference to deleted haml lint todo file ( #29675 )
2024-03-20 22:12:11 +00:00
62722238c9
Lock `i18n` gem to version `1.14.1` ( #29674 )
2024-03-20 22:10:50 +00:00
3341db939c
Merge pull request #2686 from ClearlyClaire/glitch-soc/cherry-pick
...
Fix error when attempting to delete posts that triggered a notification request (#29666 )
2024-03-20 20:13:24 +01:00
821fc53583
Fix error when attempting to delete posts that triggered a notification request ( #29666 )
2024-03-20 19:53:20 +01:00
58a606e0ab
Merge pull request #2685 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 8a1423a474
2024-03-20 19:43:22 +01:00
49089817b0
[Glitch] Fix “Explore” icon in navigation bar not being filled when selected
...
Port 3211e960ac
2024-03-20 18:33:00 +01:00
c0aade79b0
Merge commit '8a1423a47425dd67615e94bdfd13d64b53676da4' into glitch-soc/merge-upstream
2024-03-20 18:31:09 +01:00
be52633ee4
Change back button to always appear in advanced web UI ( #29669 )
2024-03-20 17:21:03 +00:00
Claire
Eugen Rochko
github-actions[bot]
renovate[bot]
Matt Jankowski
Renaud Chaput
Nick Schonning