diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
commit | ee664acb356f8123f4f6b00b73c1e1cf0866c7fb (patch) | |
tree | f8479f94a28f66654c6a4f6fb99bad6b4e86a40e /app/controllers/ide_controller.rb | |
parent | 62f7d5c5b69180e82ae8196b7b429eeffc8e7b4f (diff) |
Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42
Diffstat (limited to 'app/controllers/ide_controller.rb')
-rw-r--r-- | app/controllers/ide_controller.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/ide_controller.rb b/app/controllers/ide_controller.rb index 58a985cbc46..fcf6871d137 100644 --- a/app/controllers/ide_controller.rb +++ b/app/controllers/ide_controller.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true class IdeController < ApplicationController - layout 'fullscreen' - include ClientsidePreviewCSP include StaticObjectExternalStorageCSP include Gitlab::Utils::StrongMemoize @@ -13,7 +11,6 @@ class IdeController < ApplicationController push_frontend_feature_flag(:build_service_proxy) push_frontend_feature_flag(:schema_linting) push_frontend_feature_flag(:reject_unsigned_commits_by_gitlab) - push_frontend_feature_flag(:vscode_web_ide, current_user) define_index_vars end @@ -28,6 +25,8 @@ class IdeController < ApplicationController Gitlab::Tracking.event(self.class.to_s, 'web_ide_views', namespace: project&.namespace, user: current_user) end + + render layout: 'fullscreen', locals: { minimal: helpers.use_new_web_ide? } end private |