diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-09-04 16:02:48 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-09-04 16:02:48 +0000 |
| commit | ea4e9ada64091e186969d9656c74c7923652fcad (patch) | |
| tree | 458ce7f4bd1e776d53d16b946359759d9f5aab23 | |
| parent | b6cc38e5ab8c343508cadb3a2f80371572ec4a7d (diff) | |
| parent | 90a8a44f01e4cc0c9a17fe6c36c77283969b0f51 (diff) | |
| download | gitlab-ce-ea4e9ada64091e186969d9656c74c7923652fcad.tar.gz | |
Merge branch 'fix-smime-settings-require' into 'master'
Use spec_helper for S/MIME settings specs
See merge request gitlab-org/gitlab-ce!32647
| -rw-r--r-- | spec/config/smime_signature_settings_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/config/smime_signature_settings_spec.rb b/spec/config/smime_signature_settings_spec.rb index 4f0c227d866..38f96e9b330 100644 --- a/spec/config/smime_signature_settings_spec.rb +++ b/spec/config/smime_signature_settings_spec.rb @@ -1,4 +1,4 @@ -require 'fast_spec_helper' +require 'spec_helper' describe SmimeSignatureSettings do describe '.parse' do |