cybrespace/mastodon
4
3
Fork 3
Code Issues 7 Pull requests Releases Activity

Remove rails_12factor (#2901)

Browse source
This commit is contained in:
alpaca-tc 2017-05-09 12:15:54 +09:00 • committed by Eugen Rochko
parent 7c249dfd88
commit ef226a6f22
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -98,6 +98,5 @@ end
group :production do group :production do
gem 'lograge' gem 'lograge'
gem 'rails_12factor'
gem 'redis-rails' gem 'redis-rails'
end end

6
Gemfile.lock
View file

@ -318,11 +318,6 @@ GEM
railties (~> 5.0) railties (~> 5.0)
rails-settings-cached (0.6.5) rails-settings-cached (0.6.5)
rails (>= 4.2.0) rails (>= 4.2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (5.0.2) railties (5.0.2)
actionpack (= 5.0.2) actionpack (= 5.0.2)
activesupport (= 5.0.2) activesupport (= 5.0.2)
@ -528,7 +523,6 @@ DEPENDENCIES
rails-controller-testing rails-controller-testing
rails-i18n rails-i18n
rails-settings-cached rails-settings-cached
rails_12factor
redis (~> 3.2) redis (~> 3.2)
redis-namespace redis-namespace
redis-rails redis-rails

5
config/environments/production.rb
View file

@ -19,6 +19,11 @@ Rails.application.configure do
# Apache or NGINX already handles this. # Apache or NGINX already handles this.
config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
ActiveSupport::Logger.new(STDOUT).tap do |logger|
logger.formatter = config.log_formatter
config.logger = ActiveSupport::TaggedLogging.new(logger)
end
# Compress JavaScripts and CSS. # Compress JavaScripts and CSS.
config.assets.js_compressor = Uglifier.new(mangle: false) config.assets.js_compressor = Uglifier.new(mangle: false)
# config.assets.css_compressor = :sass # config.assets.css_compressor = :sass