diff options
author | Eugenia Grieff <egrieff@gitlab.com> | 2019-09-04 09:52:06 +0100 |
---|---|---|
committer | Eugenia Grieff <egrieff@gitlab.com> | 2019-09-04 09:52:06 +0100 |
commit | a3b4d920ba7791739300a9dcde0d18897b13afcb (patch) | |
tree | 52433c6cb061d1999ec8e40546718ea182593ba2 /spec/lib/gitlab/gpg/invalid_gpg_signature_updater_spec.rb | |
parent | 9039a937661ea7190d1615b9b0141504afbb75dc (diff) | |
parent | fb9e8646bdb9f3f1382a86da890ff509f1b4549c (diff) | |
download | gitlab-ce-a3b4d920ba7791739300a9dcde0d18897b13afcb.tar.gz |
Merge branch 'master' into 60372-milestone-link-prevent-delete-issue-after-move-it-to-another-project-260372-milestone-link-prevent-delete-issue-after-move-it-to-another-project-2
Diffstat (limited to 'spec/lib/gitlab/gpg/invalid_gpg_signature_updater_spec.rb')
-rw-r--r-- | spec/lib/gitlab/gpg/invalid_gpg_signature_updater_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/gpg/invalid_gpg_signature_updater_spec.rb b/spec/lib/gitlab/gpg/invalid_gpg_signature_updater_spec.rb index 1a2c6ef25c4..1dfca0b056c 100644 --- a/spec/lib/gitlab/gpg/invalid_gpg_signature_updater_spec.rb +++ b/spec/lib/gitlab/gpg/invalid_gpg_signature_updater_spec.rb @@ -1,4 +1,4 @@ -require 'rails_helper' +require 'spec_helper' RSpec.describe Gitlab::Gpg::InvalidGpgSignatureUpdater do describe '#run' do |