fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-28 16:07:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use existing config access to local_domain value (#30509)

Browse source
This commit is contained in:
Matt Jankowski 2024-06-03 05:15:58 -04:00 committed by GitHub
parent 974335e414
commit 249cbc449c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/auth/registrations/edit.html.haml
View file

@ -3,7 +3,7 @@
- if self_destruct? - if self_destruct?
.flash-message.warning .flash-message.warning
= t('auth.status.self_destruct', domain: ENV.fetch('LOCAL_DOMAIN')) = t('auth.status.self_destruct', domain: Rails.configuration.x.local_domain)
- else - else
= render partial: 'status', locals: { user: @user, strikes: @strikes } = render partial: 'status', locals: { user: @user, strikes: @strikes }

2
app/views/errors/self_destruct.html.haml
View file

@ -3,7 +3,7 @@
.simple_form .simple_form
%h1.title= t('self_destruct.title') %h1.title= t('self_destruct.title')
%p.lead= t('self_destruct.lead_html', domain: ENV.fetch('LOCAL_DOMAIN')) %p.lead= t('self_destruct.lead_html', domain: Rails.configuration.x.local_domain)
.form-footer .form-footer
%ul.no-list %ul.no-list

2
spec/requests/well_known/oauth_metadata_spec.rb
View file

@ -6,7 +6,7 @@ describe 'The /.well-known/oauth-authorization-server request' do
let(:protocol) { ENV.fetch('LOCAL_HTTPS', true) ? :https : :http } let(:protocol) { ENV.fetch('LOCAL_HTTPS', true) ? :https : :http }
before do before do
host! ENV.fetch('LOCAL_DOMAIN') host! Rails.configuration.x.local_domain
end end
it 'returns http success with valid JSON response' do it 'returns http success with valid JSON response' do

2
spec/support/signed_request_helpers.rb
View file

@ -6,7 +6,7 @@ module SignedRequestHelpers
headers ||= {} headers ||= {}
headers['Date'] = Time.now.utc.httpdate headers['Date'] = Time.now.utc.httpdate
headers['Host'] = ENV.fetch('LOCAL_DOMAIN') headers['Host'] = Rails.configuration.x.local_domain
signed_headers = headers.merge('(request-target)' => "get #{path}").slice('(request-target)', 'Host', 'Date') signed_headers = headers.merge('(request-target)' => "get #{path}").slice('(request-target)', 'Host', 'Date')
key_id = ActivityPub::TagManager.instance.key_uri_for(sign_with) key_id = ActivityPub::TagManager.instance.key_uri_for(sign_with)

2
spec/system/profile_spec.rb
View file

@ -7,7 +7,7 @@ describe 'Profile' do
subject { page } subject { page }
let(:local_domain) { ENV['LOCAL_DOMAIN'] } let(:local_domain) { Rails.configuration.x.local_domain }
before do before do
as_a_logged_in_user as_a_logged_in_user