Add latest changes from gitlab-org/gitlab@master

3 files changed, 2 insertions, 3 deletions

diff --git a/app/controllers/external_redirect/external_redirect_controller.rb b/app/controllers/external_redirect/external_redirect_controller.rb
index 532196157b7..c90f55e2a57 100644
--- a/app/controllers/external_redirect/external_redirect_controller.rb
+++ b/app/controllers/external_redirect/external_redirect_controller.rb
@@ -11,7 +11,6 @@ module ExternalRedirect
         redirect_to url_param
       else
         render layout: 'fullscreen', locals: {
-          minimal: true,
           url: url_param
         }
       end
diff --git a/app/controllers/ide_controller.rb b/app/controllers/ide_controller.rb
index 4cc943ac252..d9566121dcd 100644
--- a/app/controllers/ide_controller.rb
+++ b/app/controllers/ide_controller.rb
@@ -24,7 +24,7 @@ class IdeController < ApplicationController
       @fork_info = fork_info(project, params[:branch])
     end
 
-    render layout: 'fullscreen', locals: { minimal: helpers.use_new_web_ide? }
+    render layout: helpers.use_new_web_ide? ? 'fullscreen' : 'application'
   end
 
   private
diff --git a/app/controllers/web_ide/remote_ide_controller.rb b/app/controllers/web_ide/remote_ide_controller.rb
index 90652a1b6e2..8392e7a190c 100644
--- a/app/controllers/web_ide/remote_ide_controller.rb
+++ b/app/controllers/web_ide/remote_ide_controller.rb
@@ -17,7 +17,7 @@ module WebIde
     def index
       return render_404 unless Feature.enabled?(:vscode_web_ide, current_user)
 
-      render layout: 'fullscreen', locals: { minimal: true, data: root_element_data }
+      render layout: 'fullscreen', locals: { data: root_element_data }
     end
 
     private