diff options
author | Nick Thomas <nick@gitlab.com> | 2019-06-06 13:57:50 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2019-06-06 13:57:50 +0000 |
commit | 10dcfac1f17cffbbc542d47bdf27b682ab453dd2 (patch) | |
tree | 046df7d2929558adae980f2c362253bf499d0f46 /app/models/pages_domain.rb | |
parent | 64c6987dfdcd5cb78b4a192a4632b227eabe801f (diff) | |
download | gitlab-ce-10dcfac1f17cffbbc542d47bdf27b682ab453dd2.tar.gz |
Revert "Merge branch 'pages-domain_ssl-valid-period' into 'master'"revert-a05f86ce
This reverts merge request !28743
Diffstat (limited to 'app/models/pages_domain.rb')
-rw-r--r-- | app/models/pages_domain.rb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/app/models/pages_domain.rb b/app/models/pages_domain.rb index 8313d33f101..407d85b1520 100644 --- a/app/models/pages_domain.rb +++ b/app/models/pages_domain.rb @@ -134,14 +134,6 @@ class PagesDomain < ApplicationRecord "#{VERIFICATION_KEY}=#{verification_code}" end - def certificate=(certificate) - super(certificate) - - # set nil, if certificate is nil - self.certificate_valid_not_before = x509&.not_before - self.certificate_valid_not_after = x509&.not_after - end - private def set_verification_code @@ -194,7 +186,7 @@ class PagesDomain < ApplicationRecord end def x509 - return unless certificate.present? + return unless certificate @x509 ||= OpenSSL::X509::Certificate.new(certificate) rescue OpenSSL::X509::CertificateError |