Merge branch...

Merge branch '299822-flaky-test-on-spec-features-projects-show-user_sees_git_instructions_spec-rb-1-1-3-2-1-1' into 'master'

Resolve "Flaky test on ./spec/features/projects/show/user_sees_git_instructions_spec.rb[1:1:3:2:1:1]"

See merge request gitlab-org/gitlab!52457

spec/features/projects/show/user_sees_git_instructions_spec.rb

@@ -5,6 +5,13 @@ require 'spec_helper'
 RSpec.describe 'Projects > Show > User sees Git instructions' do
   let_it_be(:user) { create(:user) }
 
+  before do
+    # Reset user notification settings between examples to prevent
+    # validation failure on NotificationSetting.
+    # See https://gitlab.com/gitlab-org/gitlab/-/issues/299822#note_492817174
+    user.notification_settings.reset
+  end
+
   shared_examples_for 'redirects to the sign in page' do
     it 'redirects to the sign in page' do
       expect(current_path).to eq(new_user_session_path)