Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 4 deletions

diff --git a/spec/features/projects/members/user_requests_access_spec.rb b/spec/features/projects/members/user_requests_access_spec.rb
index a77f0bdcbe9..7e7faca9741 100644
--- a/spec/features/projects/members/user_requests_access_spec.rb
+++ b/spec/features/projects/members/user_requests_access_spec.rb
@@ -26,7 +26,6 @@ describe 'Projects > Members > User requests access', :js do
     expect(ActionMailer::Base.deliveries.last.subject).to eq "Request to join the #{project.full_name} project"
 
     expect(project.requesters.exists?(user_id: user)).to be_truthy
-    expect(page).to have_content 'Your request for access has been queued for review.'
 
     expect(page).to have_content 'Withdraw Access Request'
     expect(page).not_to have_content 'Leave Project'
@@ -64,7 +63,6 @@ describe 'Projects > Members > User requests access', :js do
 
     accept_confirm { click_link 'Withdraw Access Request' }
 
-    expect(page).to have_content 'Your access request to the project has been withdrawn.'
     expect(page).not_to have_content 'Withdraw Access Request'
     expect(page).to have_content 'Request Access'
   end
diff --git a/spec/lib/gitlab/experimentation_spec.rb b/spec/lib/gitlab/experimentation_spec.rb
index 725c23e913c..cceeb15b05d 100644
--- a/spec/lib/gitlab/experimentation_spec.rb
+++ b/spec/lib/gitlab/experimentation_spec.rb
@@ -74,7 +74,8 @@ describe Gitlab::Experimentation do
 
       describe 'URL parameter to force enable experiment' do
         context 'is not present' do
-          it 'returns false' do
+          # Disabled until https://gitlab.com/gitlab-org/gitlab/issues/34942 is solved properly
+          xit 'returns false' do
             get :index, params: { force_experiment: :test_experiment2 }
 
             expect(controller.experiment_enabled?(:test_experiment)).to be_falsey
@@ -82,7 +83,8 @@ describe Gitlab::Experimentation do
         end
 
         context 'is present' do
-          it 'returns true' do
+          # Disabled until https://gitlab.com/gitlab-org/gitlab/issues/34942 is solved properly
+          xit 'returns true' do
             get :index, params: { force_experiment: :test_experiment }
 
             expect(controller.experiment_enabled?(:test_experiment)).to be_truthy