Merge branch '9255-implement-access-controls-when-sso-enforcement-enabled-ce' into 'master'

Port migration fix from EE 9270

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

1 files changed, 4 insertions, 0 deletions

diff --git a/spec/migrations/clean_up_for_members_spec.rb b/spec/migrations/clean_up_for_members_spec.rb
index 7876536cb3e..1a79f94cf0d 100644
--- a/spec/migrations/clean_up_for_members_spec.rb
+++ b/spec/migrations/clean_up_for_members_spec.rb
@@ -2,6 +2,10 @@ require 'spec_helper'
 require Rails.root.join('db', 'migrate', '20171216111734_clean_up_for_members.rb')
 
 describe CleanUpForMembers, :migration do
+  before do
+    stub_feature_flags(enforced_sso: false)
+  end
+
   let(:migration) { described_class.new }
   let(:groups) { table(:namespaces) }
   let!(:group_member) { create_group_member }