Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
121 commits
Select commit Hold shift + click to select a range
076c8ec
Refactor server reducer into TypeScript (#39089)
Gargron May 20, 2026
e68c1c8
Accessibility: Add visible focus outlines to main search & composer f…
diondiondion May 21, 2026
d39f7bc
Accessibility: Add visible focus outlines to emoji/language search fi…
diondiondion May 21, 2026
6b5e18f
New Crowdin Translations (automated) (#39095)
github-actions[bot] May 21, 2026
fbc116e
Drop support for EOL node version 20 (#38926)
mjankowski May 21, 2026
dfcfef3
Update to ruby 4.0.5 (#39099)
oneiros May 21, 2026
adfe724
Updates vagrant to Node v24 (#39124)
ChaosExAnima May 21, 2026
fe885d5
Remove superfluous comment (#39123)
oneiros May 21, 2026
dc3ffac
Update dependency lint-staged to v17 (#38917)
renovate[bot] May 21, 2026
6735902
Fixes collection notification urls (#39127)
ChaosExAnima May 21, 2026
e54f927
Accessibility: Add skip link & landmark regions to settings (#39129)
diondiondion May 21, 2026
e18ca37
Revert "Add partial accounts to collections endpoint (#38919)" (#39128)
oneiros May 21, 2026
cafe7ea
Use display name component for empty message (#39131)
ChaosExAnima May 21, 2026
cdf721a
Fix remote statuses with large media descriptions being rejected (#39…
ClearlyClaire May 21, 2026
15a7507
Use radio buttons for emoji style preference (#39126)
diondiondion May 21, 2026
c337487
Allow HTML `lang` attribute in remote posts (#39114)
artemist May 22, 2026
efa729c
New Crowdin Translations (automated) (#39142)
github-actions[bot] May 22, 2026
fd4a9c2
Honor configuration.statuses.max_characters from /api/v2/instance (#3…
zunda May 22, 2026
ae8b794
Accessibility: Convey selected state of filters on Follows and follow…
diondiondion May 22, 2026
dee85c6
Only preload accounts in Collections when needed (#39143)
oneiros May 22, 2026
90e505d
[Accessibility] Use headings and lists in footer (#39144)
diondiondion May 22, 2026
28849e4
[Accessibility] Add list semantics to main navigation (#39145)
diondiondion May 22, 2026
6a4d14b
[Accessibility] Fix heading level gaps (#39149)
diondiondion May 22, 2026
6b26164
Make it possible to retrieve both resolved and unresolved reports by …
mkljczk May 23, 2026
71da0c4
Fix bio text overflow (#39160)
Coro365 May 26, 2026
0411003
Update dependency chromatic to v17 (#39094)
renovate[bot] May 26, 2026
9fe97e1
Accessibility: Mark pseudo element content in link footer as decorati…
diondiondion May 26, 2026
e1aa4e3
Accessibility: Add landmark regions to Web UI (#39133)
diondiondion May 26, 2026
cc03e38
Accessibility: Fix broken aria label & description in `CollectionList…
diondiondion May 26, 2026
0275a97
Don't open account hover card unless preceded by mouse movement (#39166)
diondiondion May 26, 2026
f6d1795
Fix some server-side limits not being respected in web UI (#39163)
Gargron May 26, 2026
07d099c
Add new overview landing page setting (#39074)
Gargron May 26, 2026
3559efe
Fix missing padding on email subscription form (#39162)
Gargron May 26, 2026
c39072a
Emojis: Fix bug with search + improve custom tokenization (#39167)
ChaosExAnima May 26, 2026
ceab04a
Fix missing Translate button (#39170)
diondiondion May 26, 2026
1962e47
Fix advanced UI column crashing in development (#39171)
diondiondion May 26, 2026
d20d049
Accessibility: Ensure focus order of post elements matches visual rea…
diondiondion May 26, 2026
e146525
Update dependency aws-sdk-core to v3.249.0 (#39140)
renovate[bot] May 27, 2026
32cb9e7
Update rubocop-rails to version 2.35.2 (#39137)
mjankowski May 27, 2026
f82334d
Update rubocop to version 1.86.2 (#39136)
mjankowski May 27, 2026
991a8af
New Crowdin Translations (automated) (#39152)
github-actions[bot] May 27, 2026
5f99850
Fix navigation overflow issue in advanced UI (#39178)
diondiondion May 27, 2026
bd2e86d
Refactor "copy to clipboard" functionality into hook (#39180)
diondiondion May 27, 2026
b5879fd
Refactor `BundleColumnError` to TS (#39177)
diondiondion May 27, 2026
888011d
[Accessibility] Differentiate accessible labels of About links in foo…
diondiondion May 27, 2026
d229157
Collections: Handle URLs in search (#39182)
ChaosExAnima May 27, 2026
f0726bf
Update dependency @reduxjs/toolkit to v2.12.0 (#36700)
renovate[bot] May 27, 2026
965f01f
Handle current bundler-audit CVEs (#39183)
mjankowski May 27, 2026
a5ea645
Update github/codeql-action digest to 7211b7c (#39156)
renovate[bot] May 27, 2026
ed23faf
Update codecov/codecov-action digest to e79a696 (#39155)
renovate[bot] May 27, 2026
ddd687b
Enable vertical text editing on Alt text editor (#38797)
shimon1024 May 27, 2026
9215e1e
Update Yarn to v4.15.0 (#39093)
renovate[bot] May 27, 2026
03b20bc
Use `rescue_from` to handle missing status scenario in `NotificationM…
mjankowski May 28, 2026
4ba9421
Update dependency ws to v8.21.0 (#39151)
renovate[bot] May 28, 2026
0808945
Update dependency ioredis to v5.11.0 (#39168)
renovate[bot] May 28, 2026
725b196
Update dependency pg-connection-string to v2.13.0 (#39068)
renovate[bot] May 28, 2026
ad821c8
Update dependency sidekiq to v8.1.6 (#39189)
renovate[bot] May 28, 2026
dabf28a
Update dependency sidekiq-unique-jobs to v8.1.0 (#38468)
renovate[bot] May 28, 2026
51fb5ab
Update dependency net-http to '~> 0.9.0' (#36881)
renovate[bot] May 28, 2026
161cea9
Update Node.js to 24.16 (#39130)
renovate[bot] May 28, 2026
554b6cf
Update playwright to version 1.60.0 (#39199)
mjankowski May 28, 2026
faa5944
Hydrate user-specific feature approval policy (#39194)
oneiros May 28, 2026
4101f56
Collection notification filtering (#39198)
ChaosExAnima May 28, 2026
89a32c3
Update jwt to version 2.10.3 (#39187)
mjankowski May 28, 2026
8a9ea06
fixes bug Admin Mailer trends mail not displayed correctly (#39122)
arte7 May 28, 2026
3d84865
Update dependency vite to v8.0.14 (#39121)
renovate[bot] May 28, 2026
cf6bf8e
Update dependency opentelemetry-instrumentation-rack to v0.31.1 (#39139)
renovate[bot] May 28, 2026
2dde017
Update dependency sass to v1.100.0 (#39141)
renovate[bot] May 28, 2026
fd92d33
Update dependency react-redux to v9.3.0 (#39045)
renovate[bot] May 28, 2026
f436be9
New Crowdin Translations (automated) (#39193)
github-actions[bot] May 29, 2026
f89ba96
Update dependency aws-sdk-core to v3.250.0 (#39204)
renovate[bot] May 29, 2026
6d3182a
Move Collections API to `v1` namespace (#39210)
oneiros May 29, 2026
e2754b0
Unify `queue_mail` and `mail` in admin mailer new trends spec (#39207)
mjankowski May 29, 2026
572612f
Remove `collections` feature flag (#39211)
oneiros May 29, 2026
796f771
Update dependency pg to v8.21.0 (#39067)
renovate[bot] May 29, 2026
fa1e16e
Collections: Add default recommendations (#39202)
ChaosExAnima May 29, 2026
a86f3a4
Use new Collections endpoint version (#39214)
diondiondion May 29, 2026
7fba458
Remove frontend check for collections feature flag (#39215)
diondiondion May 29, 2026
8e15e49
[Profile] Make handle button text selectable (#39217)
diondiondion May 29, 2026
0caf334
Reduce account overfetching when displaying collection lists (#39220)
diondiondion May 29, 2026
1dfad49
New Crowdin Translations (automated) (#39224)
github-actions[bot] Jun 1, 2026
ab8f9d9
Fix server rules and custom closed registrations message (#39232)
ClearlyClaire Jun 1, 2026
88c5d17
Link directly to pending user account in email notification (#39206)
vmstan Jun 1, 2026
cea662e
Update dependency rubyzip to v3.3.1 (#39227)
renovate[bot] Jun 1, 2026
d047331
Update RuboCop (non-major) to v1.87.0 (#39179)
renovate[bot] Jun 1, 2026
3af33ac
Update dependency discard to v2 (#39192)
renovate[bot] Jun 1, 2026
f6c1561
Add export for custom filters (#39085)
arte7 Jun 1, 2026
66b4b54
Update dependency aws-sdk-s3 to v1.224.0 (#39091)
renovate[bot] Jun 1, 2026
2a1f04d
Update dependency eslint-plugin-jsdoc to v63 (#39097)
renovate[bot] Jun 1, 2026
65d2c66
Update dependency @unhead/react to v3.1.1 (#39176)
renovate[bot] Jun 1, 2026
300bc7d
Add collections to moderation action button/hint text (#39234)
oneiros Jun 1, 2026
1bd13af
Fix error handling for invalid keys in signature verification (#39235)
ClearlyClaire Jun 1, 2026
95bc6f0
Move simplecov `start` to config and require to `spec_helper` (#39236)
mjankowski Jun 1, 2026
4d54d98
Fix container builds failing on repo names with uppercase characters …
TheEssem Jun 1, 2026
89d9fc8
Remove ignored_columns for columns removed in pre-4.2.0 migrations (#…
ClearlyClaire Jun 1, 2026
50b6bbe
Update vite_rails to version 3.11.0 (#39218)
mjankowski Jun 1, 2026
8d4f9a9
Move by_domain/local interaction check to filter (#39216)
mjankowski Jun 1, 2026
423d0ca
Extract text from language tagged strings for link preview (#39190)
zunda Jun 1, 2026
6c1f6f3
Update dependency @vitest/browser to v4.1.6 [SECURITY] (#39238)
renovate[bot] Jun 1, 2026
facb552
Update formatjs monorepo (#39078)
renovate[bot] Jun 1, 2026
78932fe
Add coverage for `StatusTrend.allowed` method (#39239)
mjankowski Jun 2, 2026
f851dcb
New Crowdin Translations (automated) (#39244)
github-actions[bot] Jun 2, 2026
0f7ec43
Fixes author name spacing in trending links items (#39246)
diondiondion Jun 2, 2026
78e8ee7
Make the hidden account message less misleading (#39231)
mortie Jun 2, 2026
b076ef1
Fix formatting of user names with custom emojis in `EmptyState` compo…
diondiondion Jun 2, 2026
d1c26c1
Fix not importing stylesheet recursively (#39254)
ClearlyClaire Jun 2, 2026
f0359af
Change Mastodon gGmbH => Mastodon GmbH (#39261)
renchap Jun 3, 2026
c2daca6
Merge commit from fork
ClearlyClaire Jun 3, 2026
0723601
Merge commit from fork
arte7 Jun 3, 2026
0529a1f
Bump version to v4.5.11 (#39264)
ClearlyClaire Jun 3, 2026
c5432e3
Remove `featuredObjectType` property (#39260)
oneiros Jun 3, 2026
0172d81
Remove PWA plugin (#39250)
ChaosExAnima Jun 3, 2026
0ff2c7a
Fix about page error when selecting non-default Rules language (#39267)
diondiondion Jun 3, 2026
65622a5
Exercise more of `rule_translations/_rule_translation` partial (#39266)
mjankowski Jun 3, 2026
ce3fdf7
[Accessibility] Add hotkeys `PageUp` and `PageDown` for list navigati…
diondiondion Jun 3, 2026
4cbea7f
Limit compose field height to prevent column scrolling (#39268)
diondiondion Jun 3, 2026
8b18195
Add missing FeaturedCollection vocabulary to contexts (#39251)
oneiros Jun 3, 2026
52aa8a4
Bump version to v4.6.0-beta.1 (#39222)
Gargron Jun 3, 2026
64e5179
Merge remote-tracking branch 'parent/main' into upstream-20260604
kmycode Jun 4, 2026
d0de85a
Fix lint
kmycode Jun 4, 2026
724a1ac
Fix test
kmycode Jun 4, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/3.troubleshooting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ body:
value: |
Please at least include those informations:
- Operating system: (eg. Ubuntu 24.04.2)
- Ruby version: (from `ruby --version`, eg. v4.0.4)
- Ruby version: (from `ruby --version`, eg. v4.0.5)
- Node.js version: (from `node --version`, eg. v22.16.0)
validations:
required: false
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-ruby/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ runs:
${{ inputs.additional-system-dependencies }}

- name: Set up Ruby
uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1
uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # v1
with:
ruby-version: ${{ inputs.ruby-version }}
bundler-cache: true
2 changes: 1 addition & 1 deletion .github/workflows/bundler-audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6

- name: Set up Ruby
uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1
uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # v1
with:
bundler-cache: true

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4
uses: github/codeql-action/init@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -54,7 +54,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4
uses: github/codeql-action/autobuild@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -67,6 +67,6 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4
uses: github/codeql-action/analyze@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4
with:
category: '/language:${{matrix.language}}'
2 changes: 1 addition & 1 deletion .github/workflows/lint-haml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6

- name: Set up Ruby
uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1
uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # v1
with:
bundler-cache: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6

- name: Set up Ruby
uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1
uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # v1
with:
bundler-cache: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ jobs:

- name: Upload coverage reports to Codecov
if: matrix.ruby-version == '.ruby-version'
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6
with:
files: coverage/lcov/*.lcov
env:
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
24.15
24.16
3 changes: 3 additions & 0 deletions .rubocop/rails.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ Rails/RakeEnvironment:

Rails/SkipsModelValidations:
Enabled: false

Rails/StrongParametersExpect:
Enabled: false
3 changes: 3 additions & 0 deletions .rubocop/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ Style/NumericLiterals:
AllowedPatterns:
- \d{4}_\d{2}_\d{2}_\d{6}

Style/OneClassPerFile:
Enabled: false

Style/PercentLiteralDelimiters:
PreferredDelimiters:
'%i': ()
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.4
4.0.5
2 changes: 1 addition & 1 deletion .simplecov
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

SimpleCov.start 'rails' do
SimpleCov.configure do
# During parallel runs, ensure unique names for post-run merge
command_name "job-#{ENV['TEST_ENV_NUMBER']}" if ENV['TEST_ENV_NUMBER']

Expand Down
2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ approvedGitRepositories:
enableScripts: true

nodeLinker: node-modules

npmMinimalAgeGate: 0
151 changes: 151 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ARG BASE_REGISTRY="docker.io"

# Ruby image to use for base image, change with [--build-arg RUBY_VERSION="4.0.x"]
# renovate: datasource=docker depName=docker.io/ruby
ARG RUBY_VERSION="4.0.4"
ARG RUBY_VERSION="4.0.5"
# # Node.js version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="22"]
# renovate: datasource=node-version depName=node
ARG NODE_MAJOR_VERSION="24"
Expand Down
8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ gem 'omniauth-saml', '~> 2.0'

gem 'color_diff', '~> 0.1'
gem 'csv', '~> 3.2'
gem 'discard', '~> 1.2'
gem 'discard', '~> 2.0'
gem 'doorkeeper', '~> 5.6'
gem 'faraday-httpclient'
gem 'fast_blank', '~> 1.0'
Expand Down Expand Up @@ -135,7 +135,7 @@ group :test do
# Browser integration testing
gem 'capybara', '~> 3.39'
gem 'capybara-playwright-driver'
gem 'playwright-ruby-client', '1.59.1', require: false # Pinning the exact version as it needs to be kept in sync with the installed npm package
gem 'playwright-ruby-client', '1.60.0', require: false # Pinning the exact version as it needs to be kept in sync with the installed npm package

# Used to reset the database between system tests
gem 'database_cleaner-active_record'
Expand Down Expand Up @@ -223,11 +223,11 @@ gem 'concurrent-ruby', require: false
gem 'connection_pool', require: false
gem 'xorcist', '~> 1.1'

gem 'net-http', '~> 0.6.0'
gem 'net-http', '~> 0.9.0'
gem 'rubyzip', '~> 3.0'

gem 'hcaptcha', '~> 7.1'

gem 'mail', '~> 2.8'

gem 'vite_rails', '~> 3.0.19'
gem 'vite_rails'
Loading
Loading