diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-02-10 11:37:27 +0100 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-01-31 22:53:57 +0000 |
| commit | f034f6b3ec5dc8b72f43c954ddb34bae037be254 (patch) | |
| tree | 0b30ecff2c5298d073695f6621aa1f7ce14cde79 /app/controllers/projects/pages_controller.rb | |
| parent | 930a7030b5a0080128b2fe3e2b9506717c54a6a5 (diff) | |
| download | gitlab-ce-f034f6b3ec5dc8b72f43c954ddb34bae037be254.tar.gz | |
WIP
Diffstat (limited to 'app/controllers/projects/pages_controller.rb')
| -rw-r--r-- | app/controllers/projects/pages_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/pages_controller.rb b/app/controllers/projects/pages_controller.rb index 359544472e9..055f182ae00 100644 --- a/app/controllers/projects/pages_controller.rb +++ b/app/controllers/projects/pages_controller.rb @@ -89,7 +89,7 @@ class Projects::PagesController < Projects::ApplicationController def certificate_key return unless @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 end end |