diff options
author | Marin Jankovski <marin@gitlab.com> | 2018-01-19 15:07:40 +0300 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2018-01-19 15:07:40 +0300 |
commit | 418cb3714af8337cc7b727098dd5e5d56e387e54 (patch) | |
tree | 93c7184ea4111354c01f1fad513c2e4f41e35a62 /app/models/namespace.rb | |
parent | 797ffb4a784d1183f2c6b9e67cec55fd3424dec8 (diff) | |
parent | 3541a259327061d10c04a5b287aca9349e0c7860 (diff) |
Merge branch '10-4-stable-prepare-rc8' into '10-4-stable'
Prepare 10.4 RC8 release
See merge request gitlab-org/gitlab-ce!16557
Diffstat (limited to 'app/models/namespace.rb')
-rw-r--r-- | app/models/namespace.rb | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/app/models/namespace.rb b/app/models/namespace.rb index bdcc9159d26..37a7417cafc 100644 --- a/app/models/namespace.rb +++ b/app/models/namespace.rb @@ -1,6 +1,4 @@ class Namespace < ActiveRecord::Base - acts_as_paranoid without_default_scope: true - include CacheMarkdownField include Sortable include Gitlab::ShellAdapter @@ -10,6 +8,9 @@ class Namespace < ActiveRecord::Base include AfterCommitQueue include Storage::LegacyNamespace include Gitlab::SQL::Pattern + include IgnorableColumn + + ignore_column :deleted_at # Prevent users from creating unreasonably deep level of nesting. # The number 20 was taken based on maximum nesting level of @@ -221,12 +222,6 @@ class Namespace < ActiveRecord::Base has_parent? end - def soft_delete_without_removing_associations - # We can't use paranoia's `#destroy` since this will hard-delete projects. - # Project uses `pending_delete` instead of the acts_as_paranoia gem. - self.deleted_at = Time.now - end - private def refresh_access_of_projects_invited_groups |