floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

FIX merge develop

This commit is contained in:
jasder 2021-04-23 17:07:46 +08:00
parent 713e0bba18
commit 016cf648da
4 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/issue.rb
View File

@ -6,7 +6,7 @@
# tracker_id :integer not null # tracker_id :integer not null
# project_id :integer not null # project_id :integer not null
# subject :string(255) default(""), not null # subject :string(255) default(""), not null
# description :text(65535) # description :text(4294967295)
# due_date :date # due_date :date
# category_id :integer # category_id :integer
# status_id :integer not null # status_id :integer not null
@ -14,7 +14,6 @@
# priority_id :integer not null # priority_id :integer not null
# fixed_version_id :integer # fixed_version_id :integer
# author_id :integer not null # author_id :integer not null
# lock_version :integer default("0"), not null
# created_on :datetime # created_on :datetime
# updated_on :datetime # updated_on :datetime
# start_date :date # start_date :date
@ -28,7 +27,7 @@
# closed_on :datetime # closed_on :datetime
# project_issues_index :integer # project_issues_index :integer
# issue_type :string(255) # issue_type :string(255)
# token :string(255) # token :integer default("0")
# issue_tags_value :string(255) # issue_tags_value :string(255)
# is_lock :boolean default("0") # is_lock :boolean default("0")
# issue_classify :string(255) # issue_classify :string(255)

5
app/models/laboratory.rb
View File

@ -17,11 +17,6 @@
# index_laboratories_on_identifier (identifier) UNIQUE # index_laboratories_on_identifier (identifier) UNIQUE
# index_laboratories_on_school_id (school_id) # index_laboratories_on_school_id (school_id)
# #
# Indexes
#
# index_laboratories_on_identifier (identifier) UNIQUE
# index_laboratories_on_school_id (school_id)
#
class Laboratory < ApplicationRecord class Laboratory < ApplicationRecord
belongs_to :school, optional: true belongs_to :school, optional: true

1
app/models/project.rb
View File

@ -71,6 +71,7 @@
# index_projects_on_updated_on (updated_on) # index_projects_on_updated_on (updated_on)
# #
class Project < ApplicationRecord class Project < ApplicationRecord
include Matchable include Matchable
include Publicable include Publicable

5
app/models/pull_request.rb
View File

@ -16,6 +16,11 @@
# head :string(255) # head :string(255)
# base :string(255) # base :string(255)
# issue_id :integer # issue_id :integer
# fork_project_id :integer
# is_original :boolean default("0")
# comments_count :integer default("0")
# commits_count :integer default("0")
# files_count :integer default("0")
# #
class PullRequest < ApplicationRecord class PullRequest < ApplicationRecord