diff options
author | Robert Speicher <robert@gitlab.com> | 2018-08-15 19:48:05 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-08-15 19:48:05 +0000 |
commit | 3a8e1fe9372dca597fee8f69a0ffc9c9780e1cbe (patch) | |
tree | 73cdf623f95d4fd0668d6d1a198aec96156b8819 /app | |
parent | 085ed2862ce5c53362505bfc759ac8b1b881766d (diff) | |
parent | e113671faac0a00b25729910efa6741bf1fbcb66 (diff) | |
download | gitlab-ce-3a8e1fe9372dca597fee8f69a0ffc9c9780e1cbe.tar.gz |
Merge branch 'zj-feature-flag' into 'master'50200-change-diagram-in-ha-infrastructure-gitlab-documentation-gitlab-university-high-availability-on-aws
Add Acceptance testing issue template
See merge request gitlab-org/gitlab-ce!21156
Diffstat (limited to 'app')
-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 |