zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-08-03 16:21:52 +02:00
Code Issues Projects Releases Packages Wiki Activity

catch branch up with master

Browse source
This commit is contained in:
Kyle Drake 2015-07-13 20:14:55 -07:00
commit af0a31d6a2
102 changed files with 4055 additions and 919 deletions
Download patch file Download diff file Expand all files Collapse all files

20
environment.rb
View file

@ -75,18 +75,6 @@ if ENV['RACK_ENV'] == 'development'
end
# :nocov:
# :nocov:
if $config['pubsub_url']
$pubsub_pool = ConnectionPool.new(size: 10, timeout: 5) {
Redis.new url: $config['pubsub_url']
}
end
if $config['pubsub_url'].nil? && ENV['RACK_ENV'] == 'production'
raise 'pubsub_url is missing from config'
end
# :nocov:
Sequel.datetime_class = Time
Sequel.extension :core_extensions
Sequel.extension :migration
@ -138,3 +126,11 @@ PayPal::Recurring.configure do |config|
config.password = $config['paypal_api_password']
config.signature = $config['paypal_api_signature']
end
require 'csv'
$country_codes = {}
CSV.foreach("./files/country_codes.csv") do |row|
$country_codes[row.last] = row.first
end