diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-08-17 17:10:12 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-08-17 17:10:12 +0000 |
| commit | 120ce02e5e7e72654cb42edddc25ff3b057ec136 (patch) | |
| tree | dc612e487ea3d84cc7848ff5cb74660a3d79bf5a /spec/lib | |
| parent | a58d0a0182d06efbbde57821e71c305518325d6f (diff) | |
| parent | 9606dbbb033567de9831a8cdea0e56236e7d2eb2 (diff) | |
| download | gitlab-ce-120ce02e5e7e72654cb42edddc25ff3b057ec136.tar.gz | |
Merge branch 'blacklist-destroy-all' into 'master'
Blacklist the use of destroy_all
See merge request gitlab-org/gitlab-ce!21250
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/gitlab/background_migration/create_gpg_key_subkeys_from_gpg_keys_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/background_migration/create_gpg_key_subkeys_from_gpg_keys_spec.rb b/spec/lib/gitlab/background_migration/create_gpg_key_subkeys_from_gpg_keys_spec.rb index 26d48cc8201..f92acf61682 100644 --- a/spec/lib/gitlab/background_migration/create_gpg_key_subkeys_from_gpg_keys_spec.rb +++ b/spec/lib/gitlab/background_migration/create_gpg_key_subkeys_from_gpg_keys_spec.rb @@ -5,7 +5,7 @@ describe Gitlab::BackgroundMigration::CreateGpgKeySubkeysFromGpgKeys, :migration let!(:gpg_key) { create(:gpg_key, key: GpgHelpers::User3.public_key) } before do - GpgKeySubkey.destroy_all + GpgKeySubkey.destroy_all # rubocop: disable DestroyAll end it 'generate the subkeys' do |