From 60d80518a967b7f6e023b7cd42d19d53cb6a19b8 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Sat, 16 Oct 2021 15:10:02 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 app/assets/stylesheets/components/content_editor.scss | 3 +++
 app/assets/stylesheets/page_bundles/wiki.scss         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/components/content_editor.scss b/app/assets/stylesheets/components/content_editor.scss
index 282f9091859..7f498b79d33 100644
--- a/app/assets/stylesheets/components/content_editor.scss
+++ b/app/assets/stylesheets/components/content_editor.scss
@@ -1,4 +1,7 @@
 .ProseMirror {
+  max-height: 55vh;
+  overflow-y: auto;
+
   td,
   th,
   li,
diff --git a/app/assets/stylesheets/page_bundles/wiki.scss b/app/assets/stylesheets/page_bundles/wiki.scss
index 1e6567189be..c64e159c648 100644
--- a/app/assets/stylesheets/page_bundles/wiki.scss
+++ b/app/assets/stylesheets/page_bundles/wiki.scss
@@ -152,5 +152,5 @@ ul.wiki-pages-list.content-list {
 }
 
 .wiki-form .markdown-area {
-  max-height: none;
+  max-height: 55vh;
 }