Darwin fixes
This commit is contained in:
+12
-4
@@ -11,12 +11,20 @@ require 'sprockets/railtie'
|
||||
require 'net/http' # lib/qwaiter/broadcaster/faye.rb
|
||||
|
||||
# custom override hack for the couchbase-setting gem, needs to be loaded before other gems, is settings only without dependencies
|
||||
require File.expand_path('./../../lib/couchbase-setting', __FILE__)
|
||||
#require File.expand_path('./../../lib/couchbase-setting', __FILE__)
|
||||
|
||||
Bundler.require(*Rails.groups(assets: %w[development test user_app]))
|
||||
Bundler.require(:assets) if ENV['DEPLOY'] == 'yes'
|
||||
|
||||
Bundler.require(*Rails.groups(assets: %w[ development test user_app ]))
|
||||
Bundler.require(:assets) if ENV['DEPLOY']=='yes'
|
||||
|
||||
#NOTE: the JSON.create_id getter/setter has been moved to Thread.current implementation which
|
||||
# leads to "json_class" fallbacks for created threads. Maybe this will be fixed for future
|
||||
# rails versions. Current is: 6.1.3.1
|
||||
# For now make the getter Thread universal, not safe
|
||||
module JSON
|
||||
def self.create_id
|
||||
'ruby_class'
|
||||
end
|
||||
end
|
||||
if Rails.env.development?
|
||||
class CouchRest::Connection
|
||||
alias_method :old_execute, :execute
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
development:
|
||||
validation_framework: :active_model #optional
|
||||
#database: "http://mozo:secret@localhost:5984/qwaiter_development"
|
||||
database: "http://admin:development@localhost:5984/mozo_development"
|
||||
database: "http://admin:admin@localhost:5984/mozo_development"
|
||||
#database: mozo_development
|
||||
test:
|
||||
validation_framework: :active_model #optional
|
||||
|
||||
Reference in New Issue
Block a user