a4e7cc2d94
Merge pull request #2590 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to bf153b384b
2024-01-28 14:47:35 +01:00
bf153b384b
Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
- `app/controllers/auth/passwords_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
- `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
2024-01-27 19:06:41 +01:00
420ca90071
Merge pull request #2585 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 3205a654ca
2024-01-27 18:35:29 +01:00
dd7a66949a
Fix CSS loading in redirect controller
2024-01-26 21:04:02 +01:00
54ece5040d
[Glitch] Use active variants for boost icons and increase icon size
...
Port 5a838ceaa9
2024-01-26 20:53:53 +01:00
e5f50478b5
[Glitch] Add confirmation when redirecting logged-out requests to permalink
...
Port SCSS changes from b19ae521b7
2024-01-26 20:51:08 +01:00
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
2024-01-26 20:47:20 +01:00
ae9c675930
New Crowdin Translations (automated) ( #2564 )
...
* 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-01-26 19:45:04 +01:00
108fb33478
Merge pull request #2584 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 7a1f087659
2024-01-26 18:47:09 +01:00
70de52c297
Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream
2024-01-25 19:51:19 +01:00
adde803656
Merge pull request #2583 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 01ce9df880
2024-01-25 19:50:12 +01:00
42ab855b23
Add specs for `Instance` model scopes and add `with_domain_follows` scope ( #28767 )
2024-01-25 15:28:27 +00:00
4cdf62e576
Extract `rebuild_index` method in maintenance CLI ( #28911 )
2024-01-25 15:26:51 +00:00
0b38946c87
Update paperclip and climate_control gems ( #28379 )
2024-01-25 15:18:15 +00:00
17ea22671d
Fix `Style/GuardClause` cop in app/controllers ( #28420 )
2024-01-25 15:13:41 +00:00
3205a654ca
Refactor conversations components in web UI ( #28833 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-25 14:34:26 +00:00
274a48a9f4
Extract helper methods for db connection and table existence check in `CLI::Maintenance` task ( #28281 )
2024-01-25 13:49:33 +00:00
2866106ec1
Reduce factory creation in `spec/models/account_statuses_cleanup_policy` ( #28361 )
2024-01-25 13:37:25 +00:00
c8f59d2ca4
Fix `Style/TernaryParentheses` cop ( #28387 )
2024-01-25 13:28:49 +00:00
ca7053f19c
Consolidate db test prep steps to rake task ( #28886 )
2024-01-25 13:10:39 +00:00
59d2ea0d82
New Crowdin Translations (automated) ( #28899 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-25 13:00:44 +00:00
6b6586f5d0
Add `CustomFilterKeyword#to_regex` method ( #28893 )
2024-01-25 13:00:34 +00:00
a69506a434
fix(deps): update dependency dotenv to v16.4.1 ( #28889 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-25 12:37:23 +00:00
7c9c6c7f80
Fix remaining `Rails/WhereExists` cop violations, regenerate todo ( #28892 )
2024-01-25 12:37:07 +00:00
1a565e4bea
fix(deps): update dependency axios to v1.6.6 ( #28895 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-25 12:36:20 +00:00
d158f7e622
chore(deps): update dependency rspec-rails to v6.1.1 ( #28905 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-25 12:33:56 +00:00
087415d0fe
Add tests for processing statuses using bearcap URIs ( #28904 )
2024-01-25 11:13:36 +00:00
0471a78055
Add tests for redirect confirmations ( #28903 )
2024-01-25 11:13:33 +00:00
c50274a0ac
Fix redirect confirmation for accounts ( #28902 )
2024-01-25 10:44:25 +00:00
9a8293f58d
Fix process of receiving posts with bearcaps is not working ( #26527 )
2024-01-25 10:37:09 +00:00
22e419f95e
[Glitch] Fix search form re-rendering spuriously in web UI
...
Port 01ce9df880
2024-01-24 20:53:15 +01:00
22cfab0ebf
Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream
...
Conflicts:
- `tsconfig.json`:
Upstream made style fixes, while glitch-soc had extra options.
Ported upstream's style fixes.
2024-01-24 20:42:53 +01:00
38f7f8b909
Tidy up association declaration in `Instance` model ( #28880 )
2024-01-24 17:30:28 +00:00
9c5be13980
chore(deps): update dependency chewy to v7.5.0 ( #28730 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-24 16:51:47 +00:00
7019af431d
fix(deps): update dependency dotenv to v16.4.0 ( #28872 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-24 16:51:36 +00:00
559bbf0aa6
chore(deps): update artifact actions (major) to v4 (major) ( #28415 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-24 16:51:18 +00:00
ea5397c373
chore(deps): update dependency selenium-webdriver to v4.17.0 ( #28858 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-24 14:55:06 +00:00
64993d3f77
chore(deps): update dependency haml_lint to v0.55.0 ( #28856 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-24 13:37:37 +00:00
5a838ceaa9
Use active variants for boost icons and increase icon size ( #27924 )
2024-01-24 12:37:43 +00:00
1290fede65
Fix `Rails/WhereExists` cop in app/lib ( #28862 )
2024-01-24 11:51:09 +00:00
41c2af2270
chore(deps): update dependency rubocop to v1.60.1 ( #28731 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-24 11:50:41 +00:00
634acd07c4
Merge pull request #2580 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to e2d9635074
2024-01-24 12:11:05 +01:00
b19ae521b7
Add confirmation when redirecting logged-out requests to permalink ( #27792 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-24 10:49:19 +00:00
7a1f087659
Add `created_before` and `updated_before` scopes to `MediaAttachment` ( #28869 )
2024-01-24 10:32:54 +00:00
a11a2fb052
Add error classes to api/base errors coverage ( #28864 )
2024-01-24 10:31:31 +00:00
a34d27c18f
New Crowdin Translations (automated) ( #28875 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-24 10:06:56 +00:00
9d413cbaf8
Fix `Rails/WhereExists` cop in app/models ( #28863 )
2024-01-24 09:57:49 +00:00
599bc69503
Simplify `AccountSummary.filtered` query generation ( #28868 )
2024-01-24 09:57:32 +00:00
5b1eb09d54
Add annual reports for accounts ( #28693 )
2024-01-24 09:38:10 +00:00
01ce9df880
Fix search form re-rendering spuriously in web UI ( #28876 )
2024-01-24 07:03:30 +00:00
Claire