diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-05-22 11:03:50 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-05-22 11:03:50 +0000 |
| commit | 2c7095c839800d6f11a9c259f590d93911b1bba6 (patch) | |
| tree | 0169f5e90ab5c69d20c84c471fd624a0e7e6fe47 /app/models | |
| parent | 360ec74caaa11053babaf4a205328c21dc3290a5 (diff) | |
| parent | 82576518226843bcc104739eb01975036ce8a60f (diff) | |
| download | gitlab-ce-2c7095c839800d6f11a9c259f590d93911b1bba6.tar.gz | |
Merge branch 'ab-43706-composite-primary-keys' into 'master'
Migration to add primary key constraint for composite keys
Closes #43706 and #32258
See merge request gitlab-org/gitlab-ce!18980
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 8ef3c3ceff0..5a4c373705b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -109,7 +109,7 @@ class User < ActiveRecord::Base has_many :created_projects, foreign_key: :creator_id, class_name: 'Project' has_many :users_star_projects, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent has_many :starred_projects, through: :users_star_projects, source: :project - has_many :project_authorizations + has_many :project_authorizations, dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent has_many :authorized_projects, through: :project_authorizations, source: :project has_many :user_interacted_projects |