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 code bug

This commit is contained in:
Jasder 2020-08-13 21:11:33 +08:00
parent 7a2d7f50fd
commit 8e7c25b5ed
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/user.rb
View File

@ -78,14 +78,9 @@ class User < ApplicationRecord
# 关注 # 关注
has_many :be_watchers, foreign_key: :user_id, dependent: :destroy # 我的关注 has_many :be_watchers, foreign_key: :user_id, dependent: :destroy # 我的关注
has_many :be_watcher_users, through: :be_watchers, dependent: :destroy # 我关注的用户 has_many :be_watcher_users, through: :be_watchers, dependent: :destroy # 我关注的用户
<<<<<<< HEAD
has_many :watchers, as: :watchable, dependent: :destroy has_many :watchers, as: :watchable, dependent: :destroy
has_one :dev_ops_cloud_account, class_name: 'DevOps::CloudAccount', dependent: :destroy has_one :dev_ops_cloud_account, class_name: 'DevOps::CloudAccount', dependent: :destroy
=======
has_many :watchers, as: :watchable, dependent: :destroy
>>>>>>> dev_change_route
# 认证 # 认证
has_many :apply_user_authentication has_many :apply_user_authentication