Merge branch 'feature/add-blocked-content-entry' into 'master'

Add blocked content entry

See merge request gitlab-org/gitlab!74225

app/assets/javascripts/diffs/components/diff_file.vue

@@ -10,6 +10,7 @@ import {
 import { escape } from 'lodash';
 import { mapActions, mapGetters, mapState } from 'vuex';
 import { IdState } from 'vendor/vue-virtual-scroller';
+import DiffContent from 'jh_else_ce/diffs/components/diff_content.vue';
 import createFlash from '~/flash';
 import { hasDiff } from '~/helpers/diffs_helper';
 import { diffViewerErrors } from '~/ide/constants';
@@ -28,7 +29,6 @@ import {
 import eventHub from '../event_hub';
 import { DIFF_FILE, GENERIC_ERROR, CONFLICT_TEXT } from '../i18n';
 import { collapsedType, getShortShaFromFile } from '../utils/diff_file';
-import DiffContent from './diff_content.vue';
 import DiffFileHeader from './diff_file_header.vue';
 
 export default {

app/views/projects/blob/_content.html.haml

+- blob = local_assigns.fetch(:blob, nil)
 - simple_viewer = blob.simple_viewer
 - rich_viewer = blob.rich_viewer
 - rich_viewer_active = rich_viewer && params[:viewer] != 'simple'

app/views/projects/blob/_header.html.haml

 - blame = local_assigns.fetch(:blame, false)
+- blob = local_assigns.fetch(:blob, nil)
 .js-file-title.file-title-flex-parent
   = render 'projects/blob/header_content', blob: blob
 

app/views/projects/diffs/_content.html.haml

+- diff_file = local_assigns.fetch(:diff_file, nil)
 .diff-content
   = render 'projects/diffs/viewer', viewer: diff_file.viewer

app/views/shared/wikis/_wiki_content.html.haml

+.js-wiki-page-content.md.gl-pt-2{ data: { qa_selector: 'wiki_page_content', testid: 'wiki_page_content', tracking_context: wiki_page_tracking_context(@page).to_json } }
+  = render_wiki_content(@page)

app/views/shared/wikis/show.html.haml

@@ -26,7 +26,6 @@
     %div
       - if can?(current_user, :create_wiki, @wiki.container) && @page.latest? && @valid_encoding
         = link_to sprite_icon('pencil', css_class: 'gl-icon'), wiki_page_path(@wiki, @page, action: :edit), title: 'Edit', role: "button", class: 'btn gl-button btn-icon btn-default js-wiki-edit', data: { qa_selector: 'edit_page_button', testid: 'wiki_edit_button' }
-  .js-wiki-page-content.md.gl-pt-2{ data: { qa_selector: 'wiki_page_content', testid: 'wiki_page_content', tracking_context: wiki_page_tracking_context(@page).to_json } }
-    = render_wiki_content(@page)
+  = render 'shared/wikis/wiki_content'
 
 = render 'shared/wikis/sidebar'

qa/qa/page/component/wiki.rb

@@ -11,10 +11,13 @@ module QA
 
           base.view 'app/views/shared/wikis/show.html.haml' do
             element :wiki_page_title
-            element :wiki_page_content
             element :edit_page_button
           end
 
+          base.view 'app/views/shared/wikis/_wiki_content.html.haml' do
+            element :wiki_page_content
+          end
+
           base.view 'app/views/shared/wikis/_main_links.html.haml' do
             element :new_page_button
             element :page_history_button