Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 1 deletions

diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/close_issue_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/close_issue_spec.rb
index 7b6a3579af0..83cf164ccb0 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/close_issue_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/close_issue_spec.rb
@@ -39,6 +39,7 @@ module QA
         end
 
         Page::Project::Issue::Show.perform do |show|
+          show.select_all_activities_filter
           expect(show).to have_element(:reopen_issue_button)
           expect(show).to have_content("closed via commit #{commit_sha}")
         end
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb
index b68a24ec538..925c601f869 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module QA
-  context 'Plan' do
+  context 'Plan', :smoke do
     describe 'mention' do
       let(:user) do
         Resource::User.fabricate_via_api! do |user|