zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 01:32:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:neocities/neocities

Browse source
This commit is contained in:
Kyle Drake 2016-09-26 22:20:51 -07:00
commit 93b333dbf2
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
environment.rb
View file

@ -150,5 +150,5 @@ CSV.foreach("./files/country_codes.csv") do |row|
end end
gandi_opts = {} gandi_opts = {}
gandi_opts[:env] = :test unless ENV['RACK_ENV'] == 'production' gandi_opts[:env] = :test # unless ENV['RACK_ENV'] == 'production'
$gandi = Gandi::Session.new $config['gandi_api_key'], gandi_opts $gandi = Gandi::Session.new $config['gandi_api_key'], gandi_opts

2
models/site.rb
View file

@ -1446,7 +1446,7 @@ class Site < Sequel::Model
purge_cache path purge_cache path
if pathname.extname.match HTML_REGEX if pathname.extname.match HTML_REGEX
ScreenshotWorker.perform_in 1.minute, values[:username], relative_path ScreenshotWorker.perform_in 30.seconds, values[:username], relative_path
elsif pathname.extname.match IMAGE_REGEX elsif pathname.extname.match IMAGE_REGEX
ThumbnailWorker.perform_async values[:username], relative_path ThumbnailWorker.perform_async values[:username], relative_path
end end