Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 16 deletions

diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb
index 6fd48692730..df0c0ec4202 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -11,11 +11,6 @@ module QA
           element :review_preview_dropdown
         end
 
-        # Remove once :mr_review_submit_comment ff is enabled by default
-        view 'app/assets/javascripts/batch_comments/components/publish_button.vue' do
-          element :submit_review_button
-        end
-
         view 'app/assets/javascripts/batch_comments/components/review_bar.vue' do
           element :review_bar_content
         end
@@ -170,16 +165,8 @@ module QA
             click_element(:review_preview_dropdown)
           end
 
-          # Remove if statement once :mr_review_submit_comment ff is enabled by default
-
-          if has_element?(:submit_review_dropdown, wait: 5)
-            click_element(:submit_review_dropdown)
-            click_element(:submit_review_button)
-          else
-            within_element(:review_bar_content) do
-              click_element(:submit_review_button)
-            end
-          end
+          click_element(:submit_review_dropdown)
+          click_element(:submit_review_button)
 
           # After clicking the button, wait for the review bar to disappear
           # before moving on to the next part of the test
diff --git a/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb
index b70590e65c8..4e9d74a5117 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb
@@ -45,7 +45,7 @@ module QA
           mailhog_data = JSON.parse(mailhog_response.body)
           total = mailhog_data.dig('total')
           subjects = mailhog_data.dig('items')
-            .map(&method(:mailhog_item_subject))
+            .map { |item| mailhog_item_subject(item) }
 
           Runtime::Logger.debug(%Q[Total number of emails: #{total}])
           Runtime::Logger.debug(%Q[Subjects:\n#{subjects.join("\n")}])