Merge branch 'master' of https://bitbucket.org/code2lab/nemo_encoder
This commit is contained in:
2
Gemfile
2
Gemfile
@@ -18,7 +18,7 @@ gem 'coffee-rails', '~> 4.2'
|
||||
# gem 'therubyracer', platforms: :ruby
|
||||
gem 'unicorn'
|
||||
gem 'execjs'
|
||||
gem 'rack', '~> 2.0.0'
|
||||
gem 'rack', '~> 2.0.1'
|
||||
gem 'therubyracer'
|
||||
platform :ruby do
|
||||
gem 'pg'
|
||||
|
||||
@@ -238,7 +238,7 @@ DEPENDENCIES
|
||||
listen (~> 3.0.5)
|
||||
pg
|
||||
puma (~> 3.0)
|
||||
rack (~> 2.0.0)
|
||||
rack (~> 2.0.1)
|
||||
rails (~> 5.0.0, >= 5.0.0.1)
|
||||
sass-rails (~> 5.0)
|
||||
simple_form
|
||||
|
||||
@@ -16,8 +16,8 @@ Rails.application.configure do
|
||||
|
||||
# Disable serving static files from the `/public` folder by default since
|
||||
# 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?
|
||||
config.public_file_server.enabled = true
|
||||
# Compress JavaScripts and CSS.
|
||||
config.assets.js_compressor = :uglifier
|
||||
# config.assets.css_compressor = :sass
|
||||
|
||||
Reference in New Issue
Block a user