合并代码错误
This commit is contained in:
		
							parent
							
								
									1d3bf34da6
								
							
						
					
					
						commit
						a33a26a87e
					
				| 
						 | 
					@ -131,7 +131,6 @@ class Project < ApplicationRecord
 | 
				
			||||||
  has_many :pinned_projects, dependent: :destroy 
 | 
					  has_many :pinned_projects, dependent: :destroy 
 | 
				
			||||||
  has_many :has_pinned_users, through: :pinned_projects, source: :owner
 | 
					  has_many :has_pinned_users, through: :pinned_projects, source: :owner
 | 
				
			||||||
  has_many :webhooks, class_name: "Gitea::Webhook", primary_key: :gpid, foreign_key: :repo_id
 | 
					  has_many :webhooks, class_name: "Gitea::Webhook", primary_key: :gpid, foreign_key: :repo_id
 | 
				
			||||||
  #has_many :user_trace_tasks, dependent: :destroy
 | 
					 | 
				
			||||||
  has_many :user_trace_tasks, dependent: :destroy
 | 
					  has_many :user_trace_tasks, dependent: :destroy
 | 
				
			||||||
  has_many :project_invite_links, dependent: :destroy
 | 
					  has_many :project_invite_links, dependent: :destroy
 | 
				
			||||||
  has_many :project_topic_ralates, dependent: :destroy
 | 
					  has_many :project_topic_ralates, dependent: :destroy
 | 
				
			||||||
| 
						 | 
					@ -140,6 +139,7 @@ class Project < ApplicationRecord
 | 
				
			||||||
  has_many :daily_project_statistics, dependent: :destroy
 | 
					  has_many :daily_project_statistics, dependent: :destroy
 | 
				
			||||||
  has_one :project_dataset, dependent: :destroy
 | 
					  has_one :project_dataset, dependent: :destroy
 | 
				
			||||||
  has_many :sync_repositories, dependent: :destroy
 | 
					  has_many :sync_repositories, dependent: :destroy
 | 
				
			||||||
 | 
					  has_many :home_top_settings, as: :top, dependent: :destroy
 | 
				
			||||||
  after_create :incre_user_statistic, :incre_platform_statistic
 | 
					  after_create :incre_user_statistic, :incre_platform_statistic
 | 
				
			||||||
  after_save :check_project_members
 | 
					  after_save :check_project_members
 | 
				
			||||||
  before_save :set_invite_code, :reset_unmember_followed, :set_recommend_and_is_pinned, :reset_cache_data
 | 
					  before_save :set_invite_code, :reset_unmember_followed, :set_recommend_and_is_pinned, :reset_cache_data
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue