Add latest changes from gitlab-org/gitlab@master

4 files changed, 6 insertions, 6 deletions

diff --git a/qa/qa/page/dashboard/snippet/new.rb b/qa/qa/page/dashboard/snippet/new.rb
index 28f1e868eb5..bcfb4734b59 100644
--- a/qa/qa/page/dashboard/snippet/new.rb
+++ b/qa/qa/page/dashboard/snippet/new.rb
@@ -31,7 +31,7 @@ module QA
             element :submit_button
           end
 
-          view 'app/views/projects/_zen.html.haml' do
+          view 'app/views/shared/_zen.html.haml' do
             # This 'element' is here only to ensure the changes in the view source aren't mistakenly changed
             element :_, "qa_selector = local_assigns.fetch(:qa_selector, '')" # rubocop:disable QA/ElementWithPattern
           end
diff --git a/qa/qa/page/project/issue/new.rb b/qa/qa/page/project/issue/new.rb
index 65c02801d67..9ef98598a3d 100644
--- a/qa/qa/page/project/issue/new.rb
+++ b/qa/qa/page/project/issue/new.rb
@@ -14,7 +14,7 @@ module QA
           end
 
           view 'app/views/shared/form_elements/_description.html.haml' do
-            element :issue_description_textarea, "render 'projects/zen', f: form, attr: :description" # rubocop:disable QA/ElementWithPattern
+            element :issue_description_textarea, "render 'shared/zen', f: form, attr: :description" # rubocop:disable QA/ElementWithPattern
           end
 
           def add_title(title)
diff --git a/qa/qa/page/project/wiki/edit.rb b/qa/qa/page/project/wiki/edit.rb
index 5d39a084d85..96301e33733 100644
--- a/qa/qa/page/project/wiki/edit.rb
+++ b/qa/qa/page/project/wiki/edit.rb
@@ -5,7 +5,7 @@ module QA
     module Project
       module Wiki
         class Edit < Page::Base
-          view 'app/views/projects/wikis/_form.html.haml' do
+          view 'app/views/shared/wikis/_form.html.haml' do
             element :wiki_title_textbox
             element :wiki_content_textarea
             element :wiki_message_textbox
diff --git a/qa/qa/page/project/wiki/show.rb b/qa/qa/page/project/wiki/show.rb
index fef839f9119..7e4e714f4a6 100644
--- a/qa/qa/page/project/wiki/show.rb
+++ b/qa/qa/page/project/wiki/show.rb
@@ -7,16 +7,16 @@ module QA
         class Show < Page::Base
           include Component::LazyLoader
 
-          view 'app/views/projects/wikis/_sidebar.html.haml' do
+          view 'app/views/shared/wikis/_sidebar.html.haml' do
             element :clone_repository_link
           end
 
-          view 'app/views/projects/wikis/show.html.haml' do
+          view 'app/views/shared/wikis/show.html.haml' do
             element :wiki_page_title
             element :wiki_page_content
           end
 
-          view 'app/views/projects/wikis/_main_links.html.haml' do
+          view 'app/views/shared/wikis/_main_links.html.haml' do
             element :new_page_button
             element :page_history_button
             element :edit_page_button