d6609635cb
[Glitch] Add a version comment to the emoji preval-ed file so it is regenerated
...
Port 383be173af
2024-01-13 12:39:09 +01:00
ca31b4de3a
[Glitch] Add new emojis from `jdecked/twemoji` 15.0
...
Port b6e353537b
2024-01-13 12:39:09 +01:00
a3b6a85521
Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Conflict due to glitch-soc-only files.
Kept those at the end of the file.
2024-01-13 12:11:29 +01:00
e76b7ebe89
Merge pull request #2563 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 2954279e9c
2024-01-12 13:19:14 +01:00
cd37048439
Move followable_by coverage to suggestions ( #28697 )
2024-01-12 09:11:34 +00:00
32eeca9c7b
Refresh instance counts in spec (fixes intermittent failure) ( #28698 )
2024-01-12 09:10:37 +00:00
923fc83190
Improve `lint-staged` config ( #28704 )
2024-01-12 09:09:57 +00:00
575ab085be
Disable `Rails/ApplicationController` for `HealthController` ( #28705 )
2024-01-12 09:08:17 +00:00
383be173af
Add a version comment to the emoji preval-ed file so it is regenerated ( #28700 )
2024-01-12 03:39:11 +00:00
15bc13c65b
Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream
2024-01-11 20:15:19 +01:00
cbc951627c
Merge pull request #2562 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 0a7cff53c2
2024-01-11 18:41:33 +01:00
8b26614fa7
Combine results include check in spec/models/account ( #28471 )
2024-01-11 16:17:45 +00:00
185c806d69
Extract spec helper for verifing to/from public AP collection namespace ( #28472 )
2024-01-11 16:17:21 +00:00
b6e353537b
Add new emojis from `jdecked/twemoji` 15.0 ( #28404 )
2024-01-11 16:15:08 +00:00
22d866ee1b
Update dependency @material-symbols/svg-600 to v0.14.4 ( #28603 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-11 15:43:45 +00:00
2954279e9c
Remove double subject call in `api/v1/admin/trends/links/links` spec ( #28695 )
2024-01-11 15:13:11 +00:00
95bd46d32a
Remove double subject call in `api/v1/admin/ip_blocks` spec ( #28696 )
2024-01-11 15:11:57 +00:00
b68f185573
Reduce `LineLength` for `react_component` helper in views/admin ( #28694 )
2024-01-11 13:14:24 +00:00
782a0165c7
Update dependency node to 20.11 ( #28670 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-11 12:48:01 +00:00
08304075be
Fix old glitch-soc migration using removed `add_column_with_default` helper
2024-01-11 13:26:17 +01:00
23d8bd8ce1
Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream
2024-01-11 13:24:20 +01:00
5dcb8d92c3
Fix lint issue in glitch-soc-only setting form
2024-01-11 13:22:39 +01:00
63acdebc5d
Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict because of a code style fix, while some changed lines are
absent from glitch-soc.
Ignored the deleted lines.
2024-01-11 13:17:13 +01:00
630b245bb4
Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/settings/scoped_settings.rb`:
Removed upstream, while glitch-soc had a change related to its theming system.
Removed as well, as it's unused.
2024-01-11 12:59:27 +01:00
e5b97eadd5
New Crowdin Translations (automated) ( #2502 )
...
* New Crowdin translations
* Update no.yml
* Update simple_form.no.yml
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-11 12:56:56 +01:00
b523188807
Merge pull request #2559 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 5dc634796a
2024-01-11 12:08:56 +01:00
3f3df9ab20
Update omniauth-cas to version 3.0.0 ( #28683 )
2024-01-11 10:57:52 +00:00
4e08a4892f
Move streaming `around` config into manager class ( #28684 )
2024-01-11 10:54:42 +00:00
87097a227c
Clean up `settings/featured_tags/index` view ( #28688 )
2024-01-11 10:45:26 +00:00
55802242ce
Refactor login activity partial (remove inline ruby) ( #28687 )
2024-01-11 10:36:27 +00:00
204bbf49d2
New Crowdin Translations (automated) ( #28692 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-11 10:08:49 +00:00
6daa69327b
Fix `LineLength` haml-lint in `t` usage ( #28686 )
2024-01-11 09:32:32 +00:00
0a7cff53c2
Add coverage for `Account.followable_by` scope ( #28689 )
2024-01-11 09:30:29 +00:00
47d213e701
Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream
2024-01-10 18:41:04 +01:00
09376a8207
[Glitch] Upgrade Redux packages
...
Port a0e237a96f
2024-01-10 18:34:23 +01:00
51d2d98174
Merge commit 'a0e237a96fca2774d3c9ed43063a45e395bb7f40' into glitch-soc/merge-upstream
2024-01-10 18:26:47 +01:00
2c70ca0674
Increase Metrics/AbcSize limit
2024-01-10 18:03:31 +01:00
7cd88ae2f4
[Glitch] Fix scrolling to detailed status not always working
...
Port d0fd14f851
2024-01-10 18:02:37 +01:00
0b2c7cdb02
Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/content_security_policy.rb`:
Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
environment variable.
Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
2024-01-10 17:51:12 +01:00
d7e13e2483
Fix potential redirection loop of streaming endpoint ( #28665 )
2024-01-10 15:05:46 +00:00
8422b8ded0
Extract capybara config and improve headless_chrome driver config ( #28681 )
2024-01-10 14:54:11 +00:00
543d7890fd
Use normalizes to prepare `User` values ( #28650 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-10 13:36:06 +00:00
00341c70ff
Use Sidekiq `fake!` instead of `inline!` in specs ( #25369 )
2024-01-10 11:06:58 +00:00
ea1c0feb86
Remove `add_column_with_default` migration helper ( #28654 )
2024-01-10 10:35:06 +00:00
36b46ea3b5
bundle add csv ( #28671 )
2024-01-10 09:37:31 +00:00
742d8d30e2
Add coverage for `--days` option to CLI `media refresh` command ( #28669 )
2024-01-10 09:36:12 +00:00
a71e918e95
Fix `LineLength` haml-lint in `media/player` view ( #28667 )
2024-01-10 09:35:01 +00:00
63d0b52cf3
Add a system spec for the `/share` endpoint ( #28672 )
2024-01-09 21:58:19 +00:00
1f44903991
Update dependency sidekiq-unique-jobs to v7.1.31 ( #27818 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-09 21:08:02 +00:00
eed4eef39a
Fix `LineLength` haml-lint in `app/views/auth` area ( #28664 )
2024-01-09 16:03:16 +00:00
Renaud Chaput