Renaud Chaput
1b70d7ed7c
Upgrade to react-router v5 ( #25047 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-19 19:44:55 +02:00
Renaud Chaput
126cd7705d
Do not display the navigation banner in the logo container ( #27476 )
2023-10-19 19:36:08 +02:00
Claire
74fd46d3ab
Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream
2023-10-19 19:14:04 +02:00
Claire
918137babc
Merge pull request #2444 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 5ef26d8fd5
2023-10-19 19:12:51 +02:00
Jeong Arm
68401fc426
[Glitch] Support "in:public" search filter
...
Port ad44d832b8
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-10-19 18:56:18 +02:00
Essem
7d7d8e0c82
Fix mastomodern bottom bar
2023-10-19 11:13:52 -05:00
Matt Jankowski
9f218c9924
Refactor appeal partial to avoid brakeman XSS warning ( #25880 )
2023-10-19 17:25:54 +02:00
Matt Jankowski
bcd0171e5e
Fix Lint/UselessAssignment
cop ( #27472 )
2023-10-19 16:55:06 +02:00
Daniel M Brasil
7bc8f03162
Add test coverage for Mastodon::CLI::Accounts#migrate
( #25284 )
2023-10-19 16:11:15 +02:00
github-actions[bot]
1ffd5a98a9
New Crowdin Translations (automated) ( #27465 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-19 14:31:25 +02:00
Brian Campbell
f76e5111f0
Consider shown and pending status in explore prompt calculation ( #27466 )
...
Co-authored-by: Brian Campbell <brcampbell@beta.team>
2023-10-19 14:25:57 +02:00
Renaud Chaput
10df97c542
The class
props should be className
( #27462 )
2023-10-19 13:22:44 +02:00
Claire
510845b6b9
Only enable github-rspec for pull_request events ( #27456 )
2023-10-18 15:20:24 +02:00
Matt Jankowski
a1b27d8b61
Fix Naming/VariableNumber
cop ( #27447 )
2023-10-18 14:26:22 +02:00
Emelia Smith
7c3fea7275
Feature: Allow token introspection without read scope ( #27142 )
2023-10-18 14:10:07 +02:00
github-actions[bot]
4612576c68
New Crowdin Translations (automated) ( #27454 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-18 11:08:10 +02:00
Matt Jankowski
63a2a4b074
Fix Performance/DeletePrefix
cop ( #27448 )
2023-10-18 10:32:09 +02:00
Daniel M Brasil
091a21e1bc
Add test coverage for Mastodon::CLI::Accounts#prune
( #25204 )
2023-10-18 10:20:50 +02:00
Claire
e9dc30cdba
Fix duplicate github annotations for rspec failures ( #27450 )
2023-10-18 10:18:34 +02:00
Claire
0d18c47c18
Enable scheduled actions only on glitch-soc's repo
2023-10-17 22:03:54 +02:00
Claire
63179f0bf4
Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream
2023-10-17 21:59:58 +02:00
Stanislas Signoud
8bbbd012d4
[Glitch] Fix missing redirections to make sure /home redirect to the advanced UI
...
Port 935d54124e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-10-17 21:48:36 +02:00
Claire
c10a667ac2
Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream
2023-10-17 21:42:49 +02:00
Claire
b867d4581e
Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/controllers/api/v1/timelines/tag_controller_spec.rb`:
Glitch-soc had a few extra lines in this file to account for a different
default setting. This file got replaced by
`spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc
additions were moved too.
Additional changes:
- `spec/requests/api/v1/statuses/sources_spec.rb`:
Add glitch-soc-only attribute `content_type`.
2023-10-17 21:35:07 +02:00
Claire
656a41db2a
Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated its README, we have a completely different one.
Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
Upstream refactored stuff and the conflict is because of glitch-soc's theming
system.
Ported upstream changes while accounting for the different theming system.
2023-10-17 20:59:18 +02:00
Nick Schonning
5ef26d8fd5
Add RSpec GitHub annotations gem ( #24040 )
2023-10-17 18:28:09 +02:00
Matt Jankowski
71447ab19f
Fix Capybara/ClickLinkOrButtonStyle
cop in spec/features/admin area ( #27445 )
2023-10-17 16:57:19 +02:00
renovate[bot]
0036de46bc
Update dependency rubocop-performance to v1.19.1 ( #26949 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-17 16:16:12 +02:00
Jeong Arm
ad44d832b8
Support "in:public" search filter ( #26976 )
2023-10-17 16:12:03 +02:00
Matt Jankowski
2528a0721f
Update rubocop-capybara
to version 2.19.0 ( #26982 )
2023-10-17 16:10:50 +02:00
renovate[bot]
1996fb6fd6
Update dependency puma to v6.4.0 ( #27006 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-17 16:10:16 +02:00
Matt Jankowski
65cd0700e4
Refactor domains cli to remove model call from regex ( #25878 )
2023-10-17 15:58:42 +02:00
Claire
b34a2b1b33
Fix errors in CLI specs ( #27399 )
2023-10-17 15:30:12 +02:00
Jeong Arm
c0cda1adaf
Let use http_hidden_proxy on docker-compose ( #27054 )
2023-10-17 15:24:45 +02:00
Renaud Chaput
1fb4e40145
Run scheduled actions only on the main repo ( #27343 )
2023-10-17 14:59:39 +02:00
Stanislas Signoud
935d54124e
Fix missing redirections to make sure /home redirect to the advanced UI ( #27378 )
2023-10-17 14:59:07 +02:00
Victor Lee
c4bddc9855
Add spec for poll model ( #23399 )
...
Co-authored-by: Nick Schonning <nschonni@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-17 14:56:24 +02:00
Matt Jankowski
12bb7be8b5
Spec speed ups on AccountsController
spec ( #25391 )
2023-10-17 13:32:10 +02:00
Matt Jankowski
d54fec24e5
Add coverage for CLI::PreviewCards#remove
command ( #27441 )
2023-10-17 13:06:16 +02:00
Matt Jankowski
19900f647e
Add coverage for UnreservedUsernameValidator
( #25590 )
2023-10-17 13:05:28 +02:00
Claire
1084703417
Update changelog ( #27440 )
2023-10-17 13:03:54 +02:00
Matt Jankowski
fc9ab61448
Expand spec coverage of CLI::Media
( #27437 )
2023-10-16 18:20:58 +02:00
Matt Jankowski
33b073f77d
Extract partials from admin/reports/show
view ( #27427 )
2023-10-16 18:07:17 +02:00
Matt Jankowski
8d0f12f776
Extract partials from admin/accounts/show
view ( #27428 )
2023-10-16 18:02:15 +02:00
Matt Jankowski
893b2f33fd
Extract shared example for cacheable response in specs ( #25388 )
2023-10-16 17:52:06 +02:00
Matt Jankowski
708299bb0d
Misc coverage improvements for Admin::
and Settings::
controllers ( #25346 )
2023-10-16 17:20:28 +02:00
Daniel M Brasil
e0ed0f8c7c
Migrate to request specs in /api/v1/notifications
( #25553 )
2023-10-16 17:15:24 +02:00
Matt Jankowski
08a376cbcb
Fix Style/CombinableLoops
cop ( #27429 )
2023-10-16 16:36:28 +02:00
Matt Jankowski
c91c0175db
Extract card
partial from disputes/strikes/show
view ( #27426 )
2023-10-16 16:04:29 +02:00
Daniel M Brasil
cafdaec6cf
Migrate to request specs in /api/v1/lists/:id/accounts
( #25468 )
2023-10-16 16:03:48 +02:00