Merge remote-tracking branch 'origin/develop' into standalone_develop

# Conflicts:
#	app/models/pull_request.rb
This commit is contained in:
“xxq250”
2022-07-26 10:49:49 +08:00
34 changed files with 655 additions and 39 deletions
-1
View File
@@ -69,7 +69,6 @@ class Issue < ApplicationRecord
has_many :issue_tags, through: :issue_tags_relates
has_many :issue_times, dependent: :destroy
has_many :issue_depends, dependent: :destroy
has_many :reviews, dependent: :destroy
scope :issue_includes, ->{includes(:user)}
scope :issue_many_includes, ->{includes(journals: :user)}
scope :issue_issue, ->{where(issue_classify: [nil,"issue"])}