zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 9 Releases Wiki Activity

Match dependency-generator output for `require_relative` usage (#32800)

This commit is contained in:
Matt Jankowski 2024-11-08 04:55:15 -05:00 committed by GitHub
parent 8df867b20a
commit 4ef3a1a38d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Rakefile
View File

@ -3,6 +3,6 @@
# 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.
require File.expand_path('config/application', __dir__)
require_relative 'config/application'
Rails.application.load_tasks

3
config.ru
View File

@ -2,5 +2,6 @@
# 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

2
spec/rails_helper.rb
View File

@ -32,7 +32,7 @@ end
STREAMING_PORT = ENV.fetch('TEST_STREAMING_PORT', '4020')
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?