Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
f034f6b3
Commit
f034f6b3
authored
Feb 10, 2016
by
Kamil Trzcinski
Committed by
James Edwards-Jones
Jan 31, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WIP
parent
930a7030
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/controllers/projects/pages_controller.rb
app/controllers/projects/pages_controller.rb
+1
-1
No files found.
app/controllers/projects/pages_controller.rb
View file @
f034f6b3
...
@@ -89,7 +89,7 @@ class Projects::PagesController < Projects::ApplicationController
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment