Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-16 01:09:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream reworked how CSS classes for the document's body are computed.
  Slight conflict due to glitch-soc's different theming system.
  Updated as upstream did.
This commit is contained in:
Claire
2024-09-06 19:25:31 +02:00
parent 4cd74585ae 7335a43b6d
commit 29124990a2
172 changed files with 781 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spec/requests/api/v2/instance_spec.rb
View File

@@ -15,7 +15,7 @@ RSpec.describe 'Instances' do
expect(response)
.to have_http_status(200)
expect(body_as_json)
expect(response.parsed_body)
.to be_present
.and include(title: 'Mastodon Glitch Edition')
.and include_api_versions
@@ -30,7 +30,7 @@ RSpec.describe 'Instances' do
expect(response)
.to have_http_status(200)
expect(body_as_json)
expect(response.parsed_body)
.to be_present
.and include(title: 'Mastodon Glitch Edition')
.and include_api_versions