diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-24 23:35:05 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-24 23:35:05 +0000 |
| commit | 69ab616b386a2f4679d94edcdf20760517d59ba2 (patch) | |
| tree | f2a7057be47892a4c11adb71d147eeb053e0b4d5 | |
| parent | a799bd3c26caf51546ed23229bc14c9e7ba651aa (diff) | |
| parent | e3fb9b1609497e4152e6c14709cb295824372bc9 (diff) | |
| download | gitlab-ce-69ab616b386a2f4679d94edcdf20760517d59ba2.tar.gz | |
Merge branch 'user-subscriptions-dependent' into 'master'
Clean up subscriptions when user is deleted.
cc @vsizov
See merge request !439
| -rw-r--r-- | app/models/user.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 50f664a09a3..979150b4d68 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -110,6 +110,7 @@ class User < ActiveRecord::Base has_many :notes, dependent: :destroy, foreign_key: :author_id has_many :merge_requests, dependent: :destroy, foreign_key: :author_id has_many :events, dependent: :destroy, foreign_key: :author_id, class_name: "Event" + has_many :subscriptions, dependent: :destroy has_many :recent_events, -> { order "id DESC" }, foreign_key: :author_id, class_name: "Event" has_many :assigned_issues, dependent: :destroy, foreign_key: :assignee_id, class_name: "Issue" has_many :assigned_merge_requests, dependent: :destroy, foreign_key: :assignee_id, class_name: "MergeRequest" |