yystopf
/
forgeplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/gitea/base.rb
View File

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

15
config/database.yml.example
View File

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