Fix production setting and update Gemfile

This commit is contained in:
manson 2014-07-07 10:58:00 +08:00
parent 911976078b
commit e2add1bc06
6 changed files with 4 additions and 3 deletions

View File

@ -1,7 +1,7 @@
source 'https://rubygems.org' source 'https://rubygems.org'
#rails gem #rails gem
gem 'rails', '4.1.0.rc2' gem 'rails', '~> 4.1.0'
#assets and templates #assets and templates
gem 'sass-rails', '~> 4.0.2' gem 'sass-rails', '~> 4.0.2'
@ -27,7 +27,7 @@ gem 'nokogiri'
gem 'httparty' gem 'httparty'
#database #database
gem 'mongoid', github: "mongoid/mongoid", ref: 'f9e6fdb' gem 'mongoid', github: "mongoid/mongoid"
#file uploading and carrierwave #file uploading and carrierwave
gem "mini_magick", github: 'minimagick/minimagick' gem "mini_magick", github: 'minimagick/minimagick'

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
app/assets/images/flag.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

View File

@ -23,7 +23,7 @@ Orbit::Application.configure do
config.serve_static_assets = false config.serve_static_assets = false
# Compress JavaScripts and CSS. # Compress JavaScripts and CSS.
config.assets.js_compressor = :uglifier # config.assets.js_compressor = :uglifier
# config.assets.css_compressor = :sass # config.assets.css_compressor = :sass
# Do not fallback to assets pipeline if a precompiled asset is missed. # Do not fallback to assets pipeline if a precompiled asset is missed.
@ -60,6 +60,7 @@ Orbit::Application.configure do
# Precompile additional assets. # Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
# config.assets.precompile += %w( search.js ) # config.assets.precompile += %w( search.js )
config.assets.precompile += %w( ckeditor/* )
# Ignore bad email addresses and do not raise email delivery errors. # Ignore bad email addresses and do not raise email delivery errors.
# Set this to true and configure the email server for immediate delivery to raise delivery errors. # Set this to true and configure the email server for immediate delivery to raise delivery errors.