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

Merge upstream changes up to b06fd54c305915527e3a6edc575dc23b623143ef #2892

Merged
merged 43 commits into from
Nov 6, 2024
Merged

Merge upstream changes up to b06fd54c305915527e3a6edc575dc23b623143ef #2892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
9074c1f
Use `likes` and `shares` totalItems on status creations and updates (…
sneakers-the-rat Oct 28, 2024
1edb527
Enhance coverage for `StatusPin` model (#32515)
mjankowski Oct 28, 2024
d547bf2
Update rails to version 7.1.4.2 (#32670)
mjankowski Oct 28, 2024
48f6f46
Update dependency react-select to v5.8.2 (#32661)
renovate[bot] Oct 28, 2024
c391928
Update DefinitelyTyped types (non-major) (#32674)
renovate[bot] Oct 28, 2024
6a5a59c
Update dependency @formatjs/cli to v6.3.5 (#32675)
renovate[bot] Oct 28, 2024
0426cb7
New Crowdin Translations (automated) (#32589)
github-actions[bot] Oct 28, 2024
dc0b194
Feat: Implement interaction modal for Polls (#32609)
ThisIsMissEm Oct 28, 2024
b1d3c64
Fix and improve batch attachment deletion handling when using OpenSta…
hugogameiro Oct 28, 2024
6f5eb22
Mailer header partial access cleanup (#32585)
mjankowski Oct 28, 2024
cff1846
Update babel monorepo to v7.26.0 (#32659)
renovate[bot] Oct 28, 2024
dc07743
Misc gem version bumps (#32684)
mjankowski Oct 29, 2024
b107fc2
Use nil for timestamp column in admin/confirmations spec (#32682)
mjankowski Oct 29, 2024
d94a367
Add test coverage for POST /api/v2/media's max description length (#3…
ThisIsMissEm Oct 29, 2024
244aaf9
New Crowdin Translations (automated) (#32687)
github-actions[bot] Oct 29, 2024
9de3fd6
Add telemetry for status / bio formatting (#32677)
oneiros Oct 29, 2024
311d2b7
Update dependency fog-core to '<= 2.6.0' (#32660)
renovate[bot] Oct 29, 2024
de1d8dc
Embed modal mobile fix (#32641)
DismalShadowX Oct 29, 2024
df3b954
Add `DomainHelpers` spec support module for DNS/MX stub (#32690)
mjankowski Oct 29, 2024
babee06
Add coverage for `StatusTrend` and `PreviewCardTrend` models, add `lo…
mjankowski Oct 29, 2024
742eb54
Fix preview cards with long titles erroneously causing layout changes…
ClearlyClaire Oct 30, 2024
7f743f3
Update dependency libvips to v8.16.0 (#32679)
renovate[bot] Oct 30, 2024
110aa0a
Update workbox monorepo to v7.3.0 (#32691)
renovate[bot] Oct 30, 2024
0a599d0
New Crowdin Translations (automated) (#32695)
github-actions[bot] Oct 30, 2024
e1b7382
Add userinfo oauth endpoint (#32548)
ThisIsMissEm Oct 30, 2024
01e25af
Fix 'unknown' media attachment rendering in detailed view (#32713)
renatolond Oct 31, 2024
c2b498a
Fix IDs not being serialized as strings in annual reports API (#32710)
Gargron Oct 31, 2024
e78db58
New Crowdin Translations (automated) (#32708)
github-actions[bot] Oct 31, 2024
75b2ac4
Update dependency strong_migrations to v2.0.2 (#32705)
renovate[bot] Oct 31, 2024
87aa346
Update dependency selenium-webdriver to v4.26.0 (#32698)
renovate[bot] Oct 31, 2024
b3b3c0f
Update dependency core-js to v3.39.0 (#32707)
renovate[bot] Oct 31, 2024
516c97a
Update dependency node to v22 (#32689)
renovate[bot] Oct 31, 2024
917a799
Migrate from the deprecated `azure-storage-blob` to `azure-blob` (#32…
JoeDupuis Oct 31, 2024
a20ac20
Add model spec for `Tombstone` (#32697)
mjankowski Oct 31, 2024
b231c3c
Drop support for ruby 3.1 (#32363)
mjankowski Oct 31, 2024
080b3b6
Update `rails-i18n` to version 7.0.10 (#32719)
mjankowski Oct 31, 2024
b06fd54
Update `zeitwerk` to version 2.7.1 (#32723)
mjankowski Oct 31, 2024
f624ef2
Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-s…
ClearlyClaire Nov 3, 2024
9a5dcf0
[Glitch] Feat: Implement interaction modal for Polls
ThisIsMissEm Oct 28, 2024
43775c8
[Glitch] Embed modal mobile fix
DismalShadowX Oct 29, 2024
95c95da
[Glitch] Fix preview cards with long titles erroneously causing layou…
ClearlyClaire Oct 30, 2024
4d9d10e
[Glitch] Fix 'unknown' media attachment rendering in detailed view
renatolond Oct 31, 2024
b013067
Fix ruby linting issue
ClearlyClaire Nov 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/test-ruby.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ jobs:
fail-fast: false
matrix:
ruby-version:
- '3.1'
- '3.2'
- '.ruby-version'
steps:
Expand Down Expand Up @@ -226,7 +225,6 @@ jobs:
fail-fast: false
matrix:
ruby-version:
- '3.1'
- '3.2'
- '.ruby-version'
steps:
Expand Down Expand Up @@ -305,7 +303,6 @@ jobs:
fail-fast: false
matrix:
ruby-version:
- '3.1'
- '3.2'
- '.ruby-version'

Expand Down Expand Up @@ -422,7 +419,6 @@ jobs:
fail-fast: false
matrix:
ruby-version:
- '3.1'
- '3.2'
- '.ruby-version'
search-image:
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.18
22.11
2 changes: 1 addition & 1 deletion .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ AllCops:
- lib/mastodon/migration_helpers.rb
ExtraDetails: true
NewCops: enable
TargetRubyVersion: 3.1 # Oldest supported ruby version
TargetRubyVersion: 3.2 # Oldest supported ruby version

inherit_from:
- .rubocop/layout.yml
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ARG BUILDPLATFORM=${BUILDPLATFORM}
ARG RUBY_VERSION="3.3.5"
# # Node version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
# renovate: datasource=node-version depName=node
ARG NODE_MAJOR_VERSION="20"
ARG NODE_MAJOR_VERSION="22"
# Debian image to use for base image, change with [--build-arg DEBIAN_VERSION="bookworm"]
ARG DEBIAN_VERSION="bookworm"
# Node image to use for base image based on combined variables (ex: 20-bookworm-slim)
Expand Down Expand Up @@ -191,7 +191,7 @@ FROM build AS libvips

# libvips version to compile, change with [--build-arg VIPS_VERSION="8.15.2"]
# renovate: datasource=github-releases depName=libvips packageName=libvips/libvips
ARG VIPS_VERSION=8.15.5
ARG VIPS_VERSION=8.16.0
# libvips download URL, change with [--build-arg VIPS_URL="https://github.com/libvips/libvips/releases/download"]
ARG VIPS_URL=https://github.com/libvips/libvips/releases/download

Expand Down
6 changes: 3 additions & 3 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

source 'https://rubygems.org'
ruby '>= 3.1.0'
ruby '>= 3.2.0'

gem 'propshaft'
gem 'puma', '~> 6.3'
Expand All @@ -16,10 +16,10 @@ gem 'pghero'

gem 'aws-sdk-s3', '~> 1.123', require: false
gem 'blurhash', '~> 0.1'
gem 'fog-core', '<= 2.5.0'
gem 'fog-core', '<= 2.6.0'
gem 'fog-openstack', '~> 1.0', require: false
gem 'jd-paperclip-azure', '~> 3.0', require: false
gem 'kt-paperclip', '~> 7.2'
gem 'md-paperclip-azure', '~> 2.2', require: false
gem 'ruby-vips', '~> 2.2', require: false

gem 'active_model_serializers', '~> 0.10'
Expand Down
Loading
Loading