Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge upstream changes up to 5ef26d8fd50081c642b858a82bf0c5431b1c7e83 #2444

Merged
merged 73 commits into from
Oct 19, 2023
Merged

Merge upstream changes up to 5ef26d8fd50081c642b858a82bf0c5431b1c7e83 #2444

merged 73 commits into from
Oct 19, 2023

Conversation

ClearlyClaire
Copy link

@ClearlyClaire ClearlyClaire commented Oct 17, 2023 •
edited
Loading

Merge upstream changes up to 77098c6

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.

Ported changes

None

Merge upstream changes up to c91c017

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.

Merge upstream changes up to 935d541

Ported changes

Merge upstream changes up to 5ef26d8

Ported changes

Additional changes

  • 0d18c47: Enable scheduled actions only on glitch-soc's repo

ClearlyClaire and others added 30 commits October 11, 2023 15:14
@ClearlyClaire
Add variable delay before link verification of remote account links (m…
7d2cd71 
…astodon#27351)
@mjankowski
Fix haml-lint InstanceVariables rule for admin/reports/actions (mas…
66becf9 
…todon#27339)
@renovate
Update dependency sidekiq to v6.5.12 (mastodon#27358)
0111e48 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Fix haml-lint InstanceVariables rule for auth/registrations/status (m…
f9abe70 
…astodon#27341)
@renovate
Update dependency lograge to v0.14.0 (mastodon#27363)
1afb7f4 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@znarf
Update README requirements from node 14 to node 16 (mastodon#27369)
608cd66
@renovate
Update dependency rubocop to v1.57.0 (mastodon#27371)
d0a3331 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#27364)
f1ae72b 
Co-authored-by: GitHub Actions <noreply@github.com>
@mjankowski
Fix haml-lint InstanceVariables rule for relationships/account (mas…
d7a8f6b 
…todon#27342)
@renovate
Update dependency devise to v4.9.3 (mastodon#27373)
85b36fb 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Fix haml-lint InstanceVariables rule for auth/sessions/two_factor/o… (
d4c2dca 
mastodon#27372)
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#27376)
c348b90 
Co-authored-by: GitHub Actions <noreply@github.com>
@ClearlyClaire
Change PWA start URL from /home to / (mastodon#27377)
c86ad45
@mjankowski
Add system specs for admin area batch actions (mastodon#25027)
133f218
@renovate
Update dependency devise-two-factor to v4.1.1 (mastodon#27382)
6a9aab3 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#27388)
773d25e 
Co-authored-by: GitHub Actions <noreply@github.com>
@kmycode
Fix when unfollow a tag, my post also disappears from the home timeli…
45bdd60 
…ne (mastodon#27391)
@renovate
Update dependency rubocop to v1.57.1 (mastodon#27389)
5c287c4 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renchap
Delete .github/FUNDING.yml (mastodon#27390)
77098c6
@danielmbrasil
Migrate to request specs in /api/v1/timelines/tag/:hashtag (mastodo…
4230d1e 
…n#25797)
@danielmbrasil
Migrate to request specs in /api/v1/statuses/:status_id/source (mas…
7664e3b 
…todon#25634)
@danielmbrasil
Migrate to request specs in /api/v1/favourites (mastodon#25518)
ecdb31d
@mjankowski
DB speedup in API:: controller/request specs (mastodon#25516)
fd9dea2
@danielmbrasil
Migrate to request specs in /api/v1/followed_tags (mastodon#25472)
bc6cd27
@mjankowski
Move SignedReqestHelpers rspec config to separate file (mastodon#25453
abf0e1f 
)
@danielmbrasil
Add request specs for /api/v1/reports (mastodon#25475)
058f73a
@mjankowski
Speed-up on MoveWorker spec (mastodon#25528)
cad8cc9
@ClearlyClaire
Fix duplicate tests (mastodon#27395)
71cfdd7
@mjankowski
Speed-up on Rack::Attack spec (mastodon#25542)
1b195ce
@danielmbrasil
Migrate to request specs in /api/v1/admin/trends/links (mastodon#25739
82beeb2 
)
mjankowski and others added 23 commits October 16, 2023 18:20
@mjankowski
Expand spec coverage of CLI::Media (mastodon#27437)
fc9ab61
@ClearlyClaire
Update changelog (mastodon#27440)
1084703
@mjankowski
Add coverage for UnreservedUsernameValidator (mastodon#25590)
19900f6
@mjankowski
Add coverage for CLI::PreviewCards#remove command (mastodon#27441)
d54fec2
@mjankowski
Spec speed ups on AccountsController spec (mastodon#25391)
12bb7be
@leevic31 @nschonni @ClearlyClaire
Add spec for poll model (mastodon#23399)
c4bddc9 
Co-authored-by: Nick Schonning <nschonni@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
@Signez
Fix missing redirections to make sure /home redirect to the advanced …
935d541 
…UI (mastodon#27378)
@renchap
Run scheduled actions only on the main repo (mastodon#27343)
1fb4e40
@tribela
Let use http_hidden_proxy on docker-compose (mastodon#27054)
c0cda1a
@ClearlyClaire
Fix errors in CLI specs (mastodon#27399)
b34a2b1
@mjankowski
Refactor domains cli to remove model call from regex (mastodon#25878)
65cd070
@renovate
Update dependency puma to v6.4.0 (mastodon#27006)
1996fb6 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Update rubocop-capybara to version 2.19.0 (mastodon#26982)
2528a07
@tribela
Support "in:public" search filter (mastodon#26976)
ad44d83
@renovate
Update dependency rubocop-performance to v1.19.1 (mastodon#26949)
0036de4 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Fix Capybara/ClickLinkOrButtonStyle cop in spec/features/admin area (…
71447ab 
…mastodon#27445)
@nschonni
Add RSpec GitHub annotations gem (mastodon#24040)
5ef26d8
@ClearlyClaire
Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-s…
656a41d 
…oc/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.
@ClearlyClaire
Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-s…
b867d45 
…oc/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`.
@ClearlyClaire
Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-s…
c10a667 
…oc/merge-upstream
@Signez @ClearlyClaire
[Glitch] Fix missing redirections to make sure /home redirect to the …
8bbbd01 
…advanced UI

Port 935d541 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-s…
63179f0 
…oc/merge-upstream
@ClearlyClaire
Enable scheduled actions only on glitch-soc's repo
0d18c47
@ClearlyClaire ClearlyClaire marked this pull request as ready for review October 17, 2023 20:59
@ClearlyClaire ClearlyClaire changed the title Merge upstream changes Merge upstream changes up to 5ef26d8fd50081c642b858a82bf0c5431b1c7e83 Oct 17, 2023
@ClearlyClaire
Copy link
Author

Forgot to port the JS part of ad44d83, will need to do it before merging.

@Plastikmensch
Copy link

Someday I will write a script which checks whether file changes in javascript/mastodon are also present in javascript/flavours/glitch...

@tribela @ClearlyClaire
[Glitch] Support "in:public" search filter
68401fc 
Port ad44d83 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire ClearlyClaire merged commit 918137b into glitch-soc:main Oct 19, 2023
40 of 41 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Plastikmensch Plastikmensch Plastikmensch approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.