Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 5 deletions

diff --git a/qa/qa/page/component/content_editor.rb b/qa/qa/page/component/content_editor.rb
index e9fc575ae39..a9abda42610 100644
--- a/qa/qa/page/component/content_editor.rb
+++ b/qa/qa/page/component/content_editor.rb
@@ -15,7 +15,6 @@ module QA
 
           base.view 'app/assets/javascripts/content_editor/components/toolbar_text_style_dropdown.vue' do
             element :text_style_dropdown
-            element :text_style_menu_item
           end
 
           base.view 'app/assets/javascripts/content_editor/components/toolbar_image_button.vue' do
@@ -33,9 +32,7 @@ module QA
             # wait for text style option to become active after typing
             has_active_element?(:text_style_dropdown, wait: 1)
             click_element(:text_style_dropdown)
-            within_element(:text_style_dropdown) do
-              click_element(:text_style_menu_item, text_style: heading)
-            end
+            find_element(:text_style_dropdown).find('li', text: heading).click
           end
         end
 
diff --git a/qa/qa/page/project/show.rb b/qa/qa/page/project/show.rb
index 168bfd6aa0a..e00458bfc3b 100644
--- a/qa/qa/page/project/show.rb
+++ b/qa/qa/page/project/show.rb
@@ -47,7 +47,7 @@ module QA
           element :tree_holder, '.tree-holder' # rubocop:disable QA/ElementWithPattern
         end
 
-        view 'app/views/projects/_fork_info.html.haml' do
+        view 'app/assets/javascripts/repository/components/fork_info.vue' do
           element :forked_from_link
         end