Automatic merge of gitlab-org/gitlab-ce master

app/helpers/page_layout_helper.rb

+# coding: utf-8
 # frozen_string_literal: true
 
 module PageLayoutHelper
@@ -36,7 +37,7 @@ module PageLayoutHelper
     if description.present?
       @page_description = description.squish
     elsif @page_description.present?
-      sanitize(@page_description, tags: []).truncate_words(30)
+      sanitize(@page_description.truncate_words(30), tags: [])
     end
   end
 

changelogs/unreleased/62116-performance-issue-502-errors-on-rendering-of-issues-with-heavy-markdown-contents.yml

+---
+title: Fix performance issue with large Markdown content in issue or merge request
+  description
+merge_request: 28597
+author:
+type: performance

changelogs/unreleased/sh-project-import-visibility-error.yml

+---
+title: Fix invalid visibility string comparison in project import
+merge_request: 28612
+author:
+type: fixed

lib/gitlab/import_export/project_tree_restorer.rb

@@ -129,7 +129,7 @@ module Gitlab
 
       def visibility_level
         level = override_params['visibility_level'] || json_params['visibility_level'] || @project.visibility_level
-        level = @project.group.visibility_level if @project.group && level > @project.group.visibility_level
+        level = @project.group.visibility_level if @project.group && level.to_i > @project.group.visibility_level
 
         { 'visibility_level' => level }
       end

spec/helpers/page_layout_helper_spec.rb

@@ -38,6 +38,14 @@ describe PageLayoutHelper do
 
       expect(helper.page_description).to eq 'Bold Header'
     end
+
+    it 'truncates before sanitizing' do
+      helper.page_description('<b>Bold</b> <img> <img> <img> <h1>Header</h1> ' * 10)
+
+      # 12 words because <img> was counted as a word
+      expect(helper.page_description)
+        .to eq('Bold    Header Bold    Header Bold    Header Bold    Header Bold    Header Bold    Header...')
+    end
   end
 
   describe 'page_image' do

spec/lib/gitlab/import_export/project_tree_restorer_spec.rb

@@ -328,6 +328,19 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
     end
 
     context 'when the project has overridden params in import data' do
+      it 'handles string versions of visibility_level' do
+        # Project needs to be in a group for visibility level comparison
+        # to happen
+        group = create(:group)
+        project.group = group
+
+        project.create_import_data(data: { override_params: { visibility_level: Gitlab::VisibilityLevel::INTERNAL.to_s } })
+
+        restored_project_json
+
+        expect(project.visibility_level).to eq(Gitlab::VisibilityLevel::INTERNAL)
+      end
+
       it 'overwrites the params stored in the JSON' do
         project.create_import_data(data: { override_params: { description: "Overridden" } })