alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into development

This commit is contained in:
Harry Bomrah 2015-02-09 15:13:52 +05:30
parent 9862722252 1aa5739380
commit 8c0d94c00a
3 changed files with 3 additions and 2 deletions

1
built_in_extensions.rb
View File

@ -5,7 +5,6 @@ gem 'gallery', git: 'http://gitlab.tp.rulingcom.com/saurabh/gallery.git'
gem 'web_resource', git: 'http://gitlab.tp.rulingcom.com/saurabh/links.git'
gem 'page_content', git: 'http://gitlab.tp.rulingcom.com/saurabh/pagecontent.git'
gem 'faq', git: 'http://gitlab.tp.rulingcom.com/saurabh/faq.git'
gem 'calendar', git: 'http://gitlab.tp.rulingcom.com/harry/calendar.git'
#Personal Plugins
gem 'personal_journal', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-journal.git'
gem 'personal_conference', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-conference.git'

1
config/environments/development.rb
View File

@ -24,6 +24,7 @@ Orbit::Application.configure do
# This option may cause significant delays in view rendering with a large
# number of complex assets.
config.assets.debug = true
config.assets.digest = true
config.action_mailer.delivery_method = :smtp
config.action_mailer.smtp_settings = { :address => "localhost", :port => 1025 }
config.action_mailer.default_url_options = { host: "localhost:3000", protocol: "http" }

3
config/environments/production.rb
View File

@ -60,7 +60,8 @@ Orbit::Application.configure do
# Precompile additional assets.
# 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( ckeditor/* )
# config.assets.precompile += %w( ckeditor/* )
config.assets.precompile += %w( *.js *.css *.js.* *.css.* ckeditor/* )
# 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.