diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /lib/gitlab/gitpod.rb | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'lib/gitlab/gitpod.rb')
-rw-r--r-- | lib/gitlab/gitpod.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/gitlab/gitpod.rb b/lib/gitlab/gitpod.rb index 11b54db72ea..e35fb8fed02 100644 --- a/lib/gitlab/gitpod.rb +++ b/lib/gitlab/gitpod.rb @@ -3,17 +3,13 @@ module Gitlab class Gitpod class << self - def feature_conditional? - feature.conditional? - end - def feature_available? # The gitpod_bundle feature could be conditionally applied, so check if `!off?` - !feature.off? + !feature.off? || feature_enabled? end def feature_enabled?(actor = nil) - feature.enabled?(actor) + Feature.enabled?(:gitpod, actor, default_enabled: true) end def feature_and_settings_enabled?(actor = nil) |