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

Upstream 20241231 #960

Merged
merged 61 commits into from
Dec 31, 2024
Merged

Upstream 20241231 #960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
02e78a7
Update devDependencies (non-major) (#33316)
renovate[bot] Dec 16, 2024
519630b
Update dependency csv to v3.3.1 (#33315)
renovate[bot] Dec 16, 2024
7447888
Update dependency oj to v3.16.8 (#33314)
renovate[bot] Dec 16, 2024
3cf6681
Change animation on feed generation screen in web UI (#33311)
Gargron Dec 16, 2024
fd0793d
Update dependency postcss-preset-env to v10.1.2 (#33303)
renovate[bot] Dec 16, 2024
d19eaeb
Update dependency dotenv to v3.1.6 (#33302)
renovate[bot] Dec 16, 2024
504ea31
New Crowdin Translations (automated) (#33310)
github-actions[bot] Dec 16, 2024
3d00b95
Convert `settings/profiles` controller spec to system spec (#33305)
mjankowski Dec 16, 2024
a596f34
Convert `settings/login_activities` controller spec to system spec (#…
mjankowski Dec 16, 2024
cf45959
Add `NOT NULL` requirement to columns on `account_conversations` (#33…
mjankowski Dec 16, 2024
6305b6e
Fix error decrementing status count when `FeaturedTags#last_status_at…
ClearlyClaire Dec 16, 2024
ecdf4ea
Update codecov/codecov-action action to v5 (#33317)
renovate[bot] Dec 16, 2024
c68eb82
Use explicit config loading from `bin/rubocop` (#33256)
mjankowski Dec 16, 2024
bfef662
Convert `settings/preferences/other` controller spec to system (#33321)
mjankowski Dec 16, 2024
9067a7f
Convert `settings/preferences/notifications` controller spec to syste…
mjankowski Dec 16, 2024
efe4e72
Convert `settings/preferences/appearance` controller spec to system (…
mjankowski Dec 16, 2024
a837f7d
Fix clicking on a profile mention while logged out potentially leadin…
ClearlyClaire Dec 16, 2024
3ac4784
Remove reference to removed `Capfile` in lint-staged config (#33329)
mjankowski Dec 17, 2024
a7673d3
Fix `application_id` erroneous inclusion in `ScheduledStatusSerialize…
mjankowski Dec 17, 2024
60bb51e
Convert `filters` spec controller->system (#33326)
mjankowski Dec 17, 2024
02748f1
New Crowdin Translations (automated) (#33332)
github-actions[bot] Dec 17, 2024
1712543
Revert "Support animated PNGs in media attachments (#28516)" (#33334)
ClearlyClaire Dec 17, 2024
f19fd0b
Change design of interaction modal in web UI (#33278)
Gargron Dec 17, 2024
978142a
Add missing `NOT NULL` on more columns from "large but valid" tables …
mjankowski Dec 17, 2024
ce5c33c
Add API datetime/format matcher for serialization specs, reduce facto…
mjankowski Dec 17, 2024
0085e8c
Wrap assertions in `change` within `AccountStatusesCleanupPolicy` spe…
mjankowski Dec 17, 2024
d65e246
Convert `statuses#activity` action controller to request spec (#33336)
mjankowski Dec 17, 2024
14234d2
Use bundler version 2.6.0 (#33337)
mjankowski Dec 18, 2024
efada38
Update dependency dotenv to v3.1.7 (#33344)
renovate[bot] Dec 18, 2024
3f9ac22
Remove empty/unused `config/storage.yml` file (#33341)
mjankowski Dec 18, 2024
3febe7d
Add OTEL trace & span IDs to logs (#33339)
renchap Dec 18, 2024
c4c9f2b
Update dependency opentelemetry-instrumentation-faraday to v0.24.8 (#…
renovate[bot] Dec 18, 2024
1992c2a
New Crowdin Translations (automated) (#33345)
github-actions[bot] Dec 18, 2024
ca2a7d6
Fix missing value limits for `UserRole` position (#33172)
mjankowski Dec 18, 2024
668ce14
Convert `admin/custom_emojis` spec controller->system (#33327)
mjankowski Dec 18, 2024
db749c7
Fix down clause for notification policy v2 migrations (#33340)
jesseplusplus Dec 18, 2024
3f8f06e
Add support for Active Record query log tags (#33342)
renchap Dec 18, 2024
85792cc
Fix incorrect notification settings migration for non-followers (#33348)
ClearlyClaire Dec 18, 2024
545a6b9
Convert `admin/account_moderation_notes` spec controller->system (#33…
mjankowski Dec 19, 2024
d014024
Use bundler version 2.6.1 (#33351)
mjankowski Dec 19, 2024
aee64a4
Remove unused `Poll.unattached` scope (#33350)
mjankowski Dec 19, 2024
22cadda
Update user role position range limit (#33349)
mjankowski Dec 19, 2024
7a08fe9
New Crowdin Translations (automated) (#33358)
github-actions[bot] Dec 19, 2024
32184e3
Update dependency test-prof to v1.4.3 (#33360)
renovate[bot] Dec 19, 2024
22813db
Fix `/health` endpoint when OTEL is configured (#33362)
renchap Dec 19, 2024
0ac4370
Add coverage for `REST::AnnualReportEventSerializer` and two `Activit…
mjankowski Dec 19, 2024
d826919
Update dependency debug to v1.10.0 (#33361)
renovate[bot] Dec 19, 2024
03bf4cd
Convert `statuses_cleanup` controller specs to system specs (#33363)
mjankowski Dec 19, 2024
1acc54c
Convert `admin/webhooks` spec controller->system (#33364)
mjankowski Dec 20, 2024
87c8921
Convert `admin/domain_allows` spec controller->system (#33365)
mjankowski Dec 20, 2024
dd56292
New Crowdin Translations (automated) (#33370)
github-actions[bot] Dec 20, 2024
28d309f
Add shared example for `Expireable` concern (#33369)
mjankowski Dec 20, 2024
aa455aa
Update opentelemetry-ruby (non-major) (#33371)
renovate[bot] Dec 20, 2024
d31d988
Add coverage for `UserMailer` not delivering to memorialized users (#…
mjankowski Dec 20, 2024
344e290
Fix featured tags for remote accounts not being kept up to date (#33372)
ClearlyClaire Dec 20, 2024
d2fbf42
Avoid `validate: false` save in expired poll create activity spec (#3…
mjankowski Dec 20, 2024
b648c64
Add `NOT NULL` requirement to columns on `polls` (#33374)
mjankowski Dec 20, 2024
f35de1e
Remove un-needed `Poll.attached` scope (#33368)
mjankowski Dec 20, 2024
b01e8f4
Update dependency ioredis to v5.4.2 (#33375)
renovate[bot] Dec 20, 2024
8770905
Convert `admin/ip_blocks` spec controller->system (#33376)
mjankowski Dec 20, 2024
3c77d4e
Merge remote-tracking branch 'parent/main' into upstream-20241231
kmycode Dec 31, 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
2 changes: 2 additions & 0 deletions .github/workflows/lint-ruby.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
- 'Gemfile*'
- '.rubocop*.yml'
- '.ruby-version'
- 'bin/rubocop'
- 'config/brakeman.ignore'
- '**/*.rb'
- '**/*.rake'
Expand All @@ -22,6 +23,7 @@ on:
- 'Gemfile*'
- '.rubocop*.yml'
- '.ruby-version'
- 'bin/rubocop'
- 'config/brakeman.ignore'
- '**/*.rb'
- '**/*.rake'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-ruby.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ jobs:

- name: Upload coverage reports to Codecov
if: matrix.ruby-version == '.ruby-version'
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
with:
files: coverage/lcov/*.lcov
env:
Expand Down Expand Up @@ -256,7 +256,7 @@ jobs:

- name: Upload coverage reports to Codecov
if: matrix.ruby-version == '.ruby-version'
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
with:
files: coverage/lcov/mastodon.lcov
env:
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ gem 'opentelemetry-api', '~> 1.4.0'
group :opentelemetry do
gem 'opentelemetry-exporter-otlp', '~> 0.29.0', require: false
gem 'opentelemetry-instrumentation-active_job', '~> 0.7.1', require: false
gem 'opentelemetry-instrumentation-active_model_serializers', '~> 0.20.1', require: false
gem 'opentelemetry-instrumentation-active_model_serializers', '~> 0.21.0', require: false
gem 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.21.2', require: false
gem 'opentelemetry-instrumentation-excon', '~> 0.22.0', require: false
gem 'opentelemetry-instrumentation-faraday', '~> 0.24.1', require: false
Expand All @@ -114,7 +114,7 @@ group :opentelemetry do
gem 'opentelemetry-instrumentation-net_http', '~> 0.22.4', require: false
gem 'opentelemetry-instrumentation-pg', '~> 0.29.0', require: false
gem 'opentelemetry-instrumentation-rack', '~> 0.25.0', require: false
gem 'opentelemetry-instrumentation-rails', '~> 0.33.0', require: false
gem 'opentelemetry-instrumentation-rails', '~> 0.34.0', require: false
gem 'opentelemetry-instrumentation-redis', '~> 0.25.3', require: false
gem 'opentelemetry-instrumentation-sidekiq', '~> 0.25.2', require: false
gem 'opentelemetry-sdk', '~> 1.4', require: false
Expand Down
Loading
Loading