diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2018-08-16 10:17:22 +0100 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2018-08-16 10:17:22 +0100 |
| commit | bfc0c602072bd5b9bf73e117d0808043adc9465e (patch) | |
| tree | ea55f6e86fdfdcccca9c593d5441c9d2c3efd441 /app/models/namespace.rb | |
| parent | 1e23577417b3e4eb06b9aba1ec174dbe78b6b9be (diff) | |
| parent | 0a666b2cb1020df4b8f7b71041b6bd109b49656a (diff) | |
| download | gitlab-ce-docs-processes.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into docs-processesdocs-processes
Diffstat (limited to 'app/models/namespace.rb')
| -rw-r--r-- | app/models/namespace.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/namespace.rb b/app/models/namespace.rb index b974309aeb6..0deb44d7916 100644 --- a/app/models/namespace.rb +++ b/app/models/namespace.rb @@ -10,6 +10,7 @@ class Namespace < ActiveRecord::Base include Storage::LegacyNamespace include Gitlab::SQL::Pattern include IgnorableColumn + include FeatureGate ignore_column :deleted_at @@ -124,7 +125,6 @@ class Namespace < ActiveRecord::Base def to_param full_path end - alias_method :flipper_id, :to_param def human_name owner_name |