Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 4 deletions

diff --git a/lib/gitlab/web_ide/config.rb b/lib/gitlab/web_ide/config.rb
index 3b1fa162b53..b2ab5c0b6e3 100644
--- a/lib/gitlab/web_ide/config.rb
+++ b/lib/gitlab/web_ide/config.rb
@@ -34,6 +34,10 @@ module Gitlab
         @global.terminal_value
       end
 
+      def schemas_value
+        @global.schemas_value
+      end
+
       private
 
       def build_config(config, opts = {})
diff --git a/lib/gitlab/web_ide/config/entry/global.rb b/lib/gitlab/web_ide/config/entry/global.rb
index 50c3f2d294f..2c67c7d02d4 100644
--- a/lib/gitlab/web_ide/config/entry/global.rb
+++ b/lib/gitlab/web_ide/config/entry/global.rb
@@ -12,18 +12,22 @@ module Gitlab
           include ::Gitlab::Config::Entry::Configurable
           include ::Gitlab::Config::Entry::Attributable
 
-          ALLOWED_KEYS = %i[terminal].freeze
+          def self.allowed_keys
+            %i[terminal].freeze
+          end
 
           validations do
-            validates :config, allowed_keys: ALLOWED_KEYS
+            validates :config, allowed_keys: Global.allowed_keys
           end
 
+          attributes allowed_keys
+
           entry :terminal, Entry::Terminal,
             description: 'Configuration of the webide terminal.'
-
-          attributes :terminal
         end
       end
     end
   end
 end
+
+::Gitlab::WebIde::Config::Entry::Global.prepend_if_ee('EE::Gitlab::WebIde::Config::Entry::Global')