diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-01-18 17:13:28 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-01-18 17:13:32 -0600 |
| commit | 4bbc1a991ccb78f53374b1583c7af0c46cefdac5 (patch) | |
| tree | 0a1270bcadc60a8befff33490bfb2d834fdd2bff | |
| parent | 1cc6d206b5d4cf09bb502a254703f3a2de2dbeb7 (diff) | |
| download | gitlab-ce-dont-delete-assigned-issuables.tar.gz | |
Don't delete assigned MRs/issues when user is deleteddont-delete-assigned-issuables
| -rw-r--r-- | app/models/user.rb | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/dont-delete-assigned-issuables.yml | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 06dd98a3188..92d2a5a30d3 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -83,8 +83,6 @@ class User < ActiveRecord::Base has_many :events, dependent: :destroy, foreign_key: :author_id 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" has_many :oauth_applications, class_name: 'Doorkeeper::Application', as: :owner, dependent: :destroy has_one :abuse_report, dependent: :destroy has_many :spam_logs, dependent: :destroy @@ -94,6 +92,9 @@ class User < ActiveRecord::Base has_many :notification_settings, dependent: :destroy has_many :award_emoji, dependent: :destroy + has_many :assigned_issues, dependent: :nullify, foreign_key: :assignee_id, class_name: "Issue" + has_many :assigned_merge_requests, dependent: :nullify, foreign_key: :assignee_id, class_name: "MergeRequest" + # # Validations # diff --git a/changelogs/unreleased/dont-delete-assigned-issuables.yml b/changelogs/unreleased/dont-delete-assigned-issuables.yml new file mode 100644 index 00000000000..fb589a053c0 --- /dev/null +++ b/changelogs/unreleased/dont-delete-assigned-issuables.yml @@ -0,0 +1,4 @@ +--- +title: Don't delete assigned MRs/issues when user is deleted +merge_request: +author: |