summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorTiago Botelho <tiagonbotelho@hotmail.com>2017-06-29 07:56:48 +0100
committerTiago Botelho <tiagonbotelho@hotmail.com>2017-06-29 07:56:48 +0100
commit7b77e2862ad1c294aeff5c0bf5f77ac3f0211801 (patch)
tree8a0cd8ebc9ddc066302d2e4aa04c6ce810dbde0c /app
parenteb175d5fe08aeefe615f39e7359d62788af8b43a (diff)
downloadgitlab-ce-7b77e2862ad1c294aeff5c0bf5f77ac3f0211801.tar.gz
Remove Namespace model default scope override and write additional test to Project searchrefactor-namespace-default-scope-override
Diffstat (limited to 'app')
-rw-r--r--app/models/namespace.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index efbed5a2ef5..743e0513e02 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -1,5 +1,5 @@
class Namespace < ActiveRecord::Base
- acts_as_paranoid
+ acts_as_paranoid without_default_scope: true
include CacheMarkdownField
include Sortable
@@ -47,8 +47,6 @@ class Namespace < ActiveRecord::Base
before_destroy(prepend: true) { prepare_for_destroy }
after_destroy :rm_dir
- default_scope { with_deleted }
-
scope :for_user, -> { where('type IS NULL') }
scope :with_statistics, -> do