Merge branch 'master' into statistics
This commit is contained in:
@@ -33,6 +33,8 @@ module CodeOcean
|
||||
case (RUBY_ENGINE)
|
||||
when 'ruby'
|
||||
# ...
|
||||
#this is enabled in prod for testing
|
||||
config.middleware.use ActiveRecord::ConnectionAdapters::ConnectionManagement
|
||||
when 'jruby'
|
||||
# plattform specific
|
||||
java.lang.Class.for_name('javax.crypto.JceSecurity').get_declared_field('isRestricted').tap{|f| f.accessible = true; f.set nil, false}
|
||||
|
@@ -18,8 +18,8 @@ production:
|
||||
active: true
|
||||
refill:
|
||||
async: false
|
||||
batch_size: 32
|
||||
interval: 30
|
||||
batch_size: 8
|
||||
interval: 15
|
||||
timeout: 60
|
||||
workspace_root: <%= Rails.root.join('tmp', 'files', Rails.env) %>
|
||||
ws_host: ws://localhost:4243
|
||||
|
Reference in New Issue
Block a user