Merge branch 'quarantine-flaky-specs' into 'master'

Put some flaky specs in quarantine

See merge request gitlab-org/gitlab-ce!27633

2 files changed, 3 insertions, 6 deletions

diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb
index b1c6f308bc6..29545779a34 100644
--- a/spec/features/admin/admin_users_spec.rb
+++ b/spec/features/admin/admin_users_spec.rb
@@ -34,14 +34,11 @@ describe "Admin::Users" do
       expect(page).to have_button('Delete user and contributions')
     end
 
-    describe "view extra user information", :js do
-      it 'does not have the user popover open' do
+    describe "view extra user information" do
+      it 'shows the user popover on hover', :js, :quarantine do
         expect(page).not_to have_selector('#__BV_popover_1__')
-      end
 
-      it 'shows the user popover on hover' do
         first_user_link = page.first('.js-user-link')
-
         first_user_link.hover
 
         expect(page).to have_selector('#__BV_popover_1__')
diff --git a/spec/services/merge_requests/merge_to_ref_service_spec.rb b/spec/services/merge_requests/merge_to_ref_service_spec.rb
index 24d09c1fd00..0ac23050caf 100644
--- a/spec/services/merge_requests/merge_to_ref_service_spec.rb
+++ b/spec/services/merge_requests/merge_to_ref_service_spec.rb
@@ -104,7 +104,7 @@ describe MergeRequests::MergeToRefService do
         it_behaves_like 'MergeService for target ref'
       end
 
-      context 'when merge commit with squash' do
+      context 'when merge commit with squash', :quarantine do
         before do
           merge_request.update!(squash: true, source_branch: 'master', target_branch: 'feature')
         end