Merge branch 'activerecord'

2019-12-17 00:16:44 +00:00
parent bc6d7dc934 5a05bd965e
commit 0b67f4c2e8
128 changed files with 814 additions and 817 deletions
--- a/core/loader.rb
+++ b/core/loader.rb
@@ -31,8 +31,7 @@ require 'execjs'
 require 'ansi'
 require 'term/ansicolor'
 require 'json'
-require 'data_objects'
-require 'dm-do-adapter'
+require 'otr-activerecord'
 require 'parseconfig'
 require 'erubis'
 require 'mime/types'
@@ -41,7 +40,6 @@ require 'resolv'
 require 'digest'
 require 'zip'
 require 'logger'
-
 # @note Logger
 require 'core/logger'