Add latest changes from gitlab-org/gitlab@master

3 files changed, 8 insertions, 0 deletions

diff --git a/spec/features/boards/new_issue_spec.rb b/spec/features/boards/new_issue_spec.rb
index 1b0695e4e60..d597c57ac1c 100644
--- a/spec/features/boards/new_issue_spec.rb
+++ b/spec/features/boards/new_issue_spec.rb
@@ -14,6 +14,10 @@ RSpec.describe 'Issue Boards new issue', :js, feature_category: :team_planning d
   let(:board_list_header) { first('[data-testid="board-list-header"]') }
   let(:project_select_dropdown) { find('[data-testid="project-select-dropdown"]') }
 
+  before do
+    stub_feature_flags(apollo_boards: false)
+  end
+
   context 'authorized user' do
     before do
       project.add_maintainer(user)
diff --git a/spec/features/boards/reload_boards_on_browser_back_spec.rb b/spec/features/boards/reload_boards_on_browser_back_spec.rb
index 0ca680c5ed5..036daee7655 100644
--- a/spec/features/boards/reload_boards_on_browser_back_spec.rb
+++ b/spec/features/boards/reload_boards_on_browser_back_spec.rb
@@ -9,6 +9,8 @@ RSpec.describe 'Ensure Boards do not show stale data on browser back', :js, feat
 
   context 'authorized user' do
     before do
+      stub_feature_flags(apollo_boards: false)
+
       project.add_maintainer(user)
 
       sign_in(user)
diff --git a/spec/features/boards/sidebar_labels_in_namespaces_spec.rb b/spec/features/boards/sidebar_labels_in_namespaces_spec.rb
index c3bb58df797..39485fe21a9 100644
--- a/spec/features/boards/sidebar_labels_in_namespaces_spec.rb
+++ b/spec/features/boards/sidebar_labels_in_namespaces_spec.rb
@@ -15,6 +15,8 @@ RSpec.describe 'Issue boards sidebar labels select', :js, feature_category: :tea
       let_it_be(:board_list) { create(:backlog_list, board: group_board) }
 
       before do
+        stub_feature_flags(apollo_boards: false)
+
         load_board group_board_path(group, group_board)
       end