Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

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)