diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-04 17:47:28 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-04 17:47:28 +0300 |
| commit | 901adec7f6b9d5372de49112ec388ba9007ef4d9 (patch) | |
| tree | b2b5dd538671305ff9df45b1b24a9243aab715a1 /spec/factories/pages_domains.rb | |
| parent | 3bc07a0be9ce3b8f736890a0513283f04796b37e (diff) | |
Add latest changes from gitlab-org/gitlab@14-6-stable-ee
Diffstat (limited to 'spec/factories/pages_domains.rb')
| -rw-r--r-- | spec/factories/pages_domains.rb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/spec/factories/pages_domains.rb b/spec/factories/pages_domains.rb index f3f2af79b76..2ba5cbb48bf 100644 --- a/spec/factories/pages_domains.rb +++ b/spec/factories/pages_domains.rb @@ -258,18 +258,6 @@ ZDXgrA== certificate_source { :gitlab_provided } end - # This contains: - # webdioxide.com - # Let's Encrypt R3 - # ISRG Root X1 (issued by DST Root CA X3) - # - # DST Root CA X3 expired on 2021-09-30, but ISRG Root X1 should be trusted on most systems. - trait :letsencrypt_expired_x3_root do - certificate do - File.read(Rails.root.join('spec/fixtures/ssl', 'letsencrypt_expired_x3.pem')) - end - end - trait :explicit_ecdsa do certificate do '-----BEGIN CERTIFICATE----- |