Use existing config access to local_domain value (#30509)
		
	This commit is contained in:
		
					parent
					
						
							
								974335e414
							
						
					
				
			
			
				commit
				
					
						249cbc449c
					
				
			
		
					 5 changed files with 5 additions and 5 deletions
				
			
		|  | @ -3,7 +3,7 @@ | |||
| 
 | ||||
| - if self_destruct? | ||||
|   .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 | ||||
|   = render partial: 'status', locals: { user: @user, strikes: @strikes } | ||||
| 
 | ||||
|  |  | |||
|  | @ -3,7 +3,7 @@ | |||
| 
 | ||||
| .simple_form | ||||
|   %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 | ||||
|   %ul.no-list | ||||
|  |  | |||
|  | @ -6,7 +6,7 @@ describe 'The /.well-known/oauth-authorization-server request' do | |||
|   let(:protocol) { ENV.fetch('LOCAL_HTTPS', true) ? :https : :http } | ||||
| 
 | ||||
|   before do | ||||
|     host! ENV.fetch('LOCAL_DOMAIN') | ||||
|     host! Rails.configuration.x.local_domain | ||||
|   end | ||||
| 
 | ||||
|   it 'returns http success with valid JSON response' do | ||||
|  |  | |||
|  | @ -6,7 +6,7 @@ module SignedRequestHelpers | |||
| 
 | ||||
|     headers ||= {} | ||||
|     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') | ||||
| 
 | ||||
|     key_id = ActivityPub::TagManager.instance.key_uri_for(sign_with) | ||||
|  |  | |||
|  | @ -7,7 +7,7 @@ describe 'Profile' do | |||
| 
 | ||||
|   subject { page } | ||||
| 
 | ||||
|   let(:local_domain) { ENV['LOCAL_DOMAIN'] } | ||||
|   let(:local_domain) { Rails.configuration.x.local_domain } | ||||
| 
 | ||||
|   before do | ||||
|     as_a_logged_in_user | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue