FIX [bug]conflicts file for pull api

app/models/gitea/base.rb

@@ -1,4 +1,6 @@
-class Gitea::Base < Gitea::Database
-  self.abstract_class = true
-  
+class Gitea::Base < ApplicationRecord
+    db_config = Rails.configuration.database_configuration[Rails.env]["gitea_server"]
+    raise 'gitea database config missing' if db_config.blank?
+
+    establish_connection db_config
 end

config/database.yml.example

@@ -17,20 +17,19 @@ default: &default
   username: root
   password: 123456
 #  socket: /var/run/mysqld/mysqld.sock
+  gitea_server:
+    aadapter: mysql2
+    database: gitea_development
+    host: 127.0.0.1
+    username: root
+    password: "123456"
+    encoding: utf8
 
 development:
   <<: *default
   host: 127.0.0.1
   database: forge_development
 
-gitea_db:
-  adapter: mysql2
-  database: gitea_development
-  host: 127.0.0.1
-  username: root
-  password: "123456"
-  encoding: utf8
-
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.