Merge branch 'master' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2020-12-21 18:28:23 +01:00
8 changed files with 89 additions and 61 deletions

View File

@@ -1,3 +1,8 @@
unless ENV.key?('RAILS_ENV')
STDERR.puts 'ERROR: Missing RAILS_ENV environment variable, please set it to "production", "development", or "test".'
exit 1
end
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
require 'bundler/setup' # Set up gems listed in the Gemfile.