Pre-import Rails 7.2 generated config minor changes (#30579)
This commit is contained in:
		
					parent
					
						
							
								e05f9fed33
							
						
					
				
			
			
				commit
				
					
						40b4f73c18
					
				
			
		
					 3 changed files with 10 additions and 15 deletions
				
			
		|  | @ -16,7 +16,7 @@ Rails.application.configure do | |||
|   # Show full error reports. | ||||
|   config.consider_all_requests_local = true | ||||
| 
 | ||||
|   # Enable server timing | ||||
|   # Enable server timing. | ||||
|   config.server_timing = true | ||||
| 
 | ||||
|   # Enable/disable caching. By default caching is disabled. | ||||
|  | @ -77,9 +77,6 @@ Rails.application.configure do | |||
|   # Annotate rendered view with file names. | ||||
|   # config.action_view.annotate_rendered_view_with_filenames = true | ||||
| 
 | ||||
|   # Uncomment if you wish to allow Action Cable access from any origin. | ||||
|   # config.action_cable.disable_request_forgery_protection = true | ||||
| 
 | ||||
|   config.action_mailer.default_options = { from: 'notifications@localhost' } | ||||
| 
 | ||||
|   # If using a Heroku, Vagrant or generic remote development environment, | ||||
|  | @ -90,7 +87,7 @@ Rails.application.configure do | |||
|   # TODO: Remove once devise-two-factor data migration complete | ||||
|   config.x.otp_secret = ENV.fetch('OTP_SECRET', '1fc2b87989afa6351912abeebe31ffc5c476ead9bf8b3d74cbc4a302c7b69a45b40b1bbef3506ddad73e942e15ed5ca4b402bf9a66423626051104f4b5f05109') | ||||
| 
 | ||||
|   # Raise error when a before_action's only/except options reference missing actions | ||||
|   # Raise error when a before_action's only/except options reference missing actions. | ||||
|   config.action_controller.raise_on_missing_callback_actions = true | ||||
| end | ||||
| 
 | ||||
|  |  | |||
|  | @ -15,17 +15,14 @@ Rails.application.configure do | |||
|   config.eager_load = true | ||||
| 
 | ||||
|   # Full error reports are disabled and caching is turned on. | ||||
|   config.consider_all_requests_local       = false | ||||
|   config.consider_all_requests_local = false | ||||
|   config.action_controller.perform_caching = true | ||||
|   config.action_controller.asset_host      = ENV['CDN_HOST'] if ENV['CDN_HOST'].present? | ||||
|   config.action_controller.asset_host = ENV['CDN_HOST'] if ENV['CDN_HOST'].present? | ||||
| 
 | ||||
|   # Ensures that a master key has been made available in ENV["RAILS_MASTER_KEY"], config/master.key, or an environment | ||||
|   # key such as config/credentials/production.key. This key is used to decrypt credentials (and other encrypted files). | ||||
|   # config.require_master_key = true | ||||
| 
 | ||||
|   # Compress CSS using a preprocessor. | ||||
|   # config.assets.css_compressor = :sass | ||||
| 
 | ||||
|   # Do not fallback to assets pipeline if a precompiled asset is missed. | ||||
|   config.assets.compile = false | ||||
| 
 | ||||
|  | @ -42,6 +39,7 @@ Rails.application.configure do | |||
| 
 | ||||
|   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. | ||||
|   config.force_ssl = true | ||||
|   # Skip http-to-https redirect for the default health check endpoint. | ||||
|   config.ssl_options = { | ||||
|     redirect: { | ||||
|       exclude: ->(request) { request.path.start_with?('/health') || request.headers['Host'].end_with?('.onion') || request.headers['Host'].end_with?('.i2p') }, | ||||
|  | @ -60,7 +58,7 @@ Rails.application.configure do | |||
|   config.cache_store = :redis_cache_store, REDIS_CONFIGURATION.cache | ||||
| 
 | ||||
|   # Use a real queuing backend for Active Job (and separate queues per environment). | ||||
|   # config.active_job.queue_adapter     = :resque | ||||
|   # config.active_job.queue_adapter = :resque | ||||
|   # config.active_job.queue_name_prefix = "mastodon_production" | ||||
| 
 | ||||
|   config.action_mailer.perform_caching = false | ||||
|  | @ -70,7 +68,7 @@ Rails.application.configure do | |||
|   # config.action_mailer.raise_delivery_errors = false | ||||
| 
 | ||||
|   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to | ||||
|   # English when a translation cannot be found). | ||||
|   # the I18n.default_locale when a translation cannot be found). | ||||
|   # This setting would typically be `true` to use the `I18n.default_locale`. | ||||
|   # Some locales are missing translation entries and would have errors: | ||||
|   # https://github.com/mastodon/mastodon/pull/24727 | ||||
|  |  | |||
|  | @ -22,11 +22,11 @@ Rails.application.configure do | |||
|   config.assets_digest = false | ||||
| 
 | ||||
|   # Show full error reports and disable caching. | ||||
|   config.consider_all_requests_local       = true | ||||
|   config.consider_all_requests_local = true | ||||
|   config.action_controller.perform_caching = false | ||||
|   config.cache_store = :memory_store | ||||
| 
 | ||||
|   # Raise exceptions instead of rendering exception templates. | ||||
|   # Render exception templates for rescuable exceptions and raise for other exceptions. | ||||
|   config.action_dispatch.show_exceptions = :rescuable | ||||
| 
 | ||||
|   # Disable request forgery protection in test environment. | ||||
|  | @ -70,7 +70,7 @@ Rails.application.configure do | |||
|   # Annotate rendered view with file names. | ||||
|   # config.action_view.annotate_rendered_view_with_filenames = true | ||||
| 
 | ||||
|   # Raise error when a before_action's only/except options reference missing actions | ||||
|   # Raise error when a before_action's only/except options reference missing actions. | ||||
|   config.action_controller.raise_on_missing_callback_actions = true | ||||
| end | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue