FIX [bug]conflicts file for pull api

This commit is contained in:
jasder
2021-06-24 16:18:34 +08:00
parent b7dd12927b
commit 8d300e11f9
2 changed files with 12 additions and 11 deletions

View File

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