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 34cd7d6585992c03298c175ab5d22ad059b58cdb #2937

Merged
merged 69 commits into from
Jan 11, 2025
Merged

Merge upstream changes up to 34cd7d6585992c03298c175ab5d22ad059b58cdb #2937

merged 69 commits into from
Jan 11, 2025

Conversation

ClearlyClaire
Copy link

Conflicts

  • CONTRIBUTING.md:
    Upstream changed the file, while we had a different one.
    Updated the common parts.
  • README.md:
    Upstream changed the file, while we had a different one.
    Updated the common parts.
  • app/helpers/application_helper.rb:
    Upstream added helpers where glitch-soc had extra ones.
    Added upstream's new helpers.
  • app/models/form/admin_settings.rb:
    Upstream added some custom handling of one setting, while glitch-soc had additional code.
    Ported upstream's code.
  • lib/mastodon/version.rb:
    Upstream moved some things to config/mastodon.yml.
    Did the same.
  • spec/requests/api/v1/accounts/credentials_spec.rb:
    I don't know honestly.

Ported changes

mjankowski and others added 30 commits January 6, 2025 19:59
@mjankowski
Add helpers for ios/android app store links in welcome mailer (mastod…
b0634b2 
…on#33475)
@mjankowski
Reference value constants from specs (mastodon#33479)
efcd4ea
@mjankowski
Use distributable? method in admin/status_policy method (mastodon#3…
dd937e1 
…3477)
@mjankowski
Add self_editing? method to user role policy (mastodon#33476)
edf62d4
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#33480)
9715bd7 
Co-authored-by: GitHub Actions <[email protected]>
@renovate @renchap
Update DefinitelyTyped types (non-major) (mastodon#33220)
8233293 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <[email protected]>
@nschonni @mjankowski
Fix Style/MultipleComparison (mastodon#33313)
c12b85e 
Co-authored-by: Matt Jankowski <[email protected]>
@ClearlyClaire
Fix preview card sizing in “Author attribution” in profile settings (m…
82e046e 
…astodon#33482)
@mjankowski
Use ruby version 3.4.1 (mastodon#33304)
927c7bb
@mjankowski
Set statement timeout to zero in maintenance CLI (mastodon#33484)
fdfbf6e
@renovate
Update dependency rubocop-performance to v1.23.1 (mastodon#33486)
fd7bcfa 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency test-prof to v1.4.4 (mastodon#33487)
7d6fd68 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@NoelDeMartin
Comment sidekiq build in docker compose (mastodon#33483)
5c4e224
@renovate
Update peter-evans/create-pull-request action to v7.0.6 (mastodon#33492)
e0863fd 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency fastimage to v2.4.0 (mastodon#33491)
5bbcb1b 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency aws-sdk-s3 to v1.177.0 (mastodon#33490)
bbe9dcf 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Remove role color highlighting from custom css (mastodon#33493)
7ad44e2
@mjankowski
Refer to constant values from api/v1/apps request spec (mastodon#33488
b3243ef 
)
@mjankowski
Extend custom CSS cache time with digest paths (mastodon#33207)
c0264c8
@renovate
Update dependency rubyzip to v2.4.1 (mastodon#33494)
c3fc12c 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Convert settings/migration spec controller->system (mastodon#33496)
b6c2923
@mjankowski
Convert auth/challenges spec controller->request (mastodon#33495)
0c69051
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#33500)
35e5713 
Co-authored-by: GitHub Actions <[email protected]>
@renovate
Update opentelemetry-ruby (non-major) (mastodon#33501)
ee1cbda 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency connection_pool to v2.5.0 (mastodon#33503)
242221c 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update opentelemetry-ruby (non-major) (mastodon#33506)
5a14206 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency core-js to v3.40.0 (mastodon#33504)
6a351e2 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@nschonni
Unpin peter-evans/create-pull-request to v7 (mastodon#30817)
67a8d46
@renovate
Update Node.js to 22.13 (mastodon#33502)
a16d83f 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency @reduxjs/toolkit to v2.5.0 (mastodon#33102)
d34e9ea 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
mjankowski and others added 28 commits January 9, 2025 08:17
@mjankowski
Remove render_template from accounts request spec (mastodon#33519)
cbae00a
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#33522)
4e2c15b 
Co-authored-by: GitHub Actions <[email protected]>
@c960657
Do now swallow response body on persistent connection (mastodon#32729)
8e2c642
@renovate
Update dependency jsdom to v26 (mastodon#33521)
b0fbb71 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency react-intl to v7 (mastodon#32954)
51a9242 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Re-introduce application_id in ScheduledStatusSerializer (mastodo…
91c75a6 
…n#33505)
@ClearlyClaire
Fix last paginated notification group only including data on a single…
c6c8e7e 
… notification (mastodon#33271)
@ClearlyClaire
Add timestamp to all announcements in Web UI (mastodon#18329)
a8b2b47
@mjankowski
Add Account#actor_type_application? query method (mastodon#33525)
9b8d1fb
@mjankowski
Rename app/helpers/jsonld_helper.rb to `app/helpers/json_ld_helper.…
3a4aed9 
…rb` (mastodon#33489)
@mjankowski
Add AccountWarning#appeal_eligible? method (mastodon#33526)
54e2030
@mjankowski
Use with_options for Account if: :local? validation group (mastod…
f98972e 
…on#33529)
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#33541)
846c89b 
Co-authored-by: GitHub Actions <[email protected]>
@mjankowski
Extract CSS_COLORS constant for UserRole regex validation (mastod…
4fb3dc0 
…on#33532)
@mjankowski
Add duplicate_record helper to maintenance CLI spec (mastodon#33536)
2499cd0
@mjankowski
Convert admin/follow_recommendations spec controller->system (masto…
8d4ca95 
…don#33533)
@renovate
Update dependency react-textarea-autosize to v8.5.7 (mastodon#33542)
d155763 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency rubocop to v1.70.0 (mastodon#33543)
1d680f1 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Convert admin/terms_of_service/histories spec controller->system (m…
a8b0152 
…astodon#33534)
@renovate
Update dependency uuid to v11.0.5 (mastodon#33538)
e0f6292 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Use in_order_of in trends/* classes (mastodon#33531)
4f6edc7
@mjankowski
Add build_object method for defaults in AP::Activity::Create spec (…
2cfc2a7 
…mastodon#33537)
@mjankowski
Use config_for for Mastodon::Version metadata/prerelease values (m…
34cd7d6 
…astodon#33548)
@ClearlyClaire
Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-s…
155dc4b 
…oc/merge-upstream

Conflicts:
- `CONTRIBUTING.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `README.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `app/helpers/application_helper.rb`:
  Upstream added helpers where glitch-soc had extra ones.
  Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
  Upstream added some custom handling of one setting, while
  glitch-soc had additional code.
  Ported upstream's code.
- `lib/mastodon/version.rb`:
  Upstream moved some things to `config/mastodon.yml`.
  Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
  I don't know honestly.
@ClearlyClaire
[Glitch] Fix preview card sizing in “Author attribution” in profile s…
19b9884 
…ettings

Port 82e046e to glitch-soc

Signed-off-by: Claire <[email protected]>
@ThisIsMissEm @ClearlyClaire
[Glitch] Include time portion in formatted datetimes when provided
fb48fc4 
Port JS part of 15669fc to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
[Glitch] Fix use of deprecated Iterable.isIndexed from immutable
00f410a 
Port 1bf6195 to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
[Glitch] Require specific subtype of formatMessage in timeAgoString
0270bd2 
Port 6b1ea8d to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire ClearlyClaire marked this pull request as ready for review January 10, 2025 21:34
@ClearlyClaire ClearlyClaire merged commit f950b97 into glitch-soc:main Jan 11, 2025
39 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@ClearlyClaire @mjankowski @nschonni @NoelDeMartin @Lamparter @ThisIsMissEm @c960657