Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.
		
			
				
	
	
		
			38 lines
		
	
	
	
		
			1.3 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			38 lines
		
	
	
	
		
			1.3 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
# Be sure to restart your server when you modify this file.
 | 
						|
 | 
						|
# Avoid CORS issues when API is called from the frontend app.
 | 
						|
# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests.
 | 
						|
 | 
						|
# Read more: https://github.com/cyu/rack-cors
 | 
						|
 | 
						|
Rails.application.config.middleware.insert_before 0, Rack::Cors do
 | 
						|
  allow do
 | 
						|
    origins '*'
 | 
						|
 | 
						|
    resource '/.well-known/*',
 | 
						|
      headers: :any,
 | 
						|
      methods: [:get],
 | 
						|
      credentials: false
 | 
						|
    resource '/@:username',
 | 
						|
      headers: :any,
 | 
						|
      methods: [:get],
 | 
						|
      credentials: false
 | 
						|
    resource '/users/:username',
 | 
						|
      headers: :any,
 | 
						|
      methods: [:get],
 | 
						|
      credentials: false
 | 
						|
    resource '/api/*',
 | 
						|
      headers: :any,
 | 
						|
      methods: [:post, :put, :delete, :get, :patch, :options],
 | 
						|
      credentials: false,
 | 
						|
      expose: ['Link', 'X-RateLimit-Reset', 'X-RateLimit-Limit', 'X-RateLimit-Remaining', 'X-Request-Id']
 | 
						|
    resource '/oauth/token',
 | 
						|
      headers: :any,
 | 
						|
      methods: [:post],
 | 
						|
      credentials: false
 | 
						|
    resource '/assets/*', headers: :any, methods: [:get, :head, :options]
 | 
						|
    resource '/stylesheets/*', headers: :any, methods: [:get, :head, :options]
 | 
						|
    resource '/javascripts/*', headers: :any, methods: [:get, :head, :options]
 | 
						|
    resource '/packs/*', headers: :any, methods: [:get, :head, :options]
 | 
						|
  end
 | 
						|
end
 |