kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

WIP

Browse source
This commit is contained in:
Kamil Trzcinski 2016-02-10 11:37:27 +01:00 committed by James Edwards-Jones
parent 930a7030b5
commit f034f6b3ec
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/projects/pages_controller.rb
View file

@ -89,7 +89,7 @@ class Projects::PagesController < Projects::ApplicationController
def certificate_key def certificate_key
return unless @project.pages_custom_certificate_key return unless @project.pages_custom_certificate_key
@certificate_key ||= OpenSSL::PKey::RSA.new(@project.pages_custom_certificate_key) @certificate_key ||= OpenSSL::PKey::RSA.new(@project.pages_custom_certificate_key)
rescue OpenSSL::PKey::PKeyError rescue OpenSSL::PKey::PKeyError, OpenSSL::Cipher::CipherError
nil nil
end end
end end