diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-05-16 20:29:21 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-05-16 20:29:21 +0000 |
| commit | 60b14e52963238bb2401004350d963eda1fabef6 (patch) | |
| tree | 4245a49a274608cae18039d87984570bad313e1f /app/models/user.rb | |
| parent | bd0a12be77840ca49cdd296e4a6d701df99024b4 (diff) | |
| parent | 2060533f91b5527b568321f63a1aa7f4ef0081d5 (diff) | |
| download | gitlab-ce-60b14e52963238bb2401004350d963eda1fabef6.tar.gz | |
Merge branch 'jprovazn-remote-upload-destroy' into 'master'
Delete remote uploads
Closes #45425
See merge request gitlab-org/gitlab-ce!18698
Diffstat (limited to 'app/models/user.rb')
| -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 226a4489261..474fde36c02 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -17,6 +17,7 @@ class User < ActiveRecord::Base include IgnorableColumn include BulkMemberAccessLoad include BlocksJsonSerialization + include WithUploads DEFAULT_NOTIFICATION_LEVEL = :participating @@ -137,7 +138,6 @@ class User < ActiveRecord::Base has_many :custom_attributes, class_name: 'UserCustomAttribute' has_many :callouts, class_name: 'UserCallout' - has_many :uploads, as: :model, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent has_many :term_agreements belongs_to :accepted_term, class_name: 'ApplicationSetting::Term' |