github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DelayedJob is disabled by default

Browse Source
This commit is contained in:
dinedine 2010-12-19 21:34:01 +01:00
parent 87caa55b80
commit d0a089fb77
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/installation_controller.rb
View File

@ -45,7 +45,9 @@ module Admin
if @site.valid? if @site.valid?
# begin # begin
unless params[:zipfile].blank?
Locomotive::Import::Job.run!(params[:zipfile], @site, { :samples => true }) Locomotive::Import::Job.run!(params[:zipfile], @site, { :samples => true })
end
# rescue Exception => e # rescue Exception => e
# logger.error "Import failed because of #{e.message}" # logger.error "Import failed because of #{e.message}"
# end # end

2
config/initializers/locomotive.rb
View File

@ -29,7 +29,7 @@ Locomotive.configure do |config|
# Locomotive uses the DelayedJob gem for the theme import module. # Locomotive uses the DelayedJob gem for the theme import module.
# In case you want to deploy to Heroku, you will have to pay for an extra dyno. # In case you want to deploy to Heroku, you will have to pay for an extra dyno.
# If you do not mind about importing theme without DelayedJob, disable it. # If you do not mind about importing theme without DelayedJob, disable it.
config.delayed_job = true config.delayed_job = false
# default locale (for now, only en and fr are supported) # default locale (for now, only en and fr are supported)
config.default_locale = :en config.default_locale = :en