diff options
author | Sean McGivern <sean@gitlab.com> | 2019-07-15 07:34:15 +0000 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2019-07-15 07:34:15 +0000 |
commit | 72261f209f5a77179c6b50d52183136e8b267f2e (patch) | |
tree | 228d7fbd137982039a51897b06842d917e8eff47 /app | |
parent | 90bf1a01d641b55eb26bc33a20910644cd16a582 (diff) | |
parent | 073f72cf91b7f284ab1f55fa781ee590a058bf05 (diff) | |
download | gitlab-ce-72261f209f5a77179c6b50d52183136e8b267f2e.tar.gz |
Merge branch 'rs-namespace-feature' into 'master'
Add Namespace#feature_available no-op
Closes #60908
See merge request gitlab-org/gitlab-ce!30641
Diffstat (limited to 'app')
-rw-r--r-- | app/models/namespace.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/models/namespace.rb b/app/models/namespace.rb index 1d95590bac9..b3021fab7f1 100644 --- a/app/models/namespace.rb +++ b/app/models/namespace.rb @@ -263,6 +263,11 @@ class Namespace < ApplicationRecord false end + # Overridden in EE::Namespace + def feature_available?(_feature) + false + end + def full_path_before_last_save if parent_id_before_last_save.nil? path_before_last_save |