Match dependency-generator output for require_relative usage (#32800)
				
					
				
			This commit is contained in:
		
							
								
								
									
										2
									
								
								Rakefile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Rakefile
									
									
									
									
									
								
							@@ -3,6 +3,6 @@
 | 
				
			|||||||
# Add your own tasks in files placed in lib/tasks ending in .rake,
 | 
					# Add your own tasks in files placed in lib/tasks ending in .rake,
 | 
				
			||||||
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 | 
					# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
require File.expand_path('config/application', __dir__)
 | 
					require_relative 'config/application'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Rails.application.load_tasks
 | 
					Rails.application.load_tasks
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,5 +2,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
# This file is used by Rack-based servers to start the application.
 | 
					# This file is used by Rack-based servers to start the application.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
require File.expand_path('config/environment', __dir__)
 | 
					require_relative 'config/environment'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
run Rails.application
 | 
					run Rails.application
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -32,7 +32,7 @@ end
 | 
				
			|||||||
STREAMING_PORT = ENV.fetch('TEST_STREAMING_PORT', '4020')
 | 
					STREAMING_PORT = ENV.fetch('TEST_STREAMING_PORT', '4020')
 | 
				
			||||||
ENV['STREAMING_API_BASE_URL'] = "http://localhost:#{STREAMING_PORT}"
 | 
					ENV['STREAMING_API_BASE_URL'] = "http://localhost:#{STREAMING_PORT}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
require File.expand_path('../config/environment', __dir__)
 | 
					require_relative '../config/environment'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
abort('The Rails environment is running in production mode!') if Rails.env.production?
 | 
					abort('The Rails environment is running in production mode!') if Rails.env.production?
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user