Darwin fixes

config/application.rb

@@ -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