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
Boxiang Sun
gitlab-ce
Commits
0552c0b6
Commit
0552c0b6
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
Fix views
parent
e5e2e7b7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
21 deletions
+22
-21
app/models/pages_domain.rb
app/models/pages_domain.rb
+2
-2
app/views/projects/pages/_list.html.haml
app/views/projects/pages/_list.html.haml
+17
-16
app/views/projects/pages/show.html.haml
app/views/projects/pages/show.html.haml
+3
-3
No files found.
app/models/pages_domain.rb
View file @
0552c0b6
...
@@ -71,8 +71,6 @@ class PagesDomain < ActiveRecord::Base
...
@@ -71,8 +71,6 @@ class PagesDomain < ActiveRecord::Base
@fingeprint
||=
OpenSSL
::
Digest
::
SHA256
.
new
(
x509
.
to_der
).
to_s
@fingeprint
||=
OpenSSL
::
Digest
::
SHA256
.
new
(
x509
.
to_der
).
to_s
end
end
private
def
x509
def
x509
return
unless
certificate
return
unless
certificate
@x509
||=
OpenSSL
::
X509
::
Certificate
.
new
(
certificate
)
@x509
||=
OpenSSL
::
X509
::
Certificate
.
new
(
certificate
)
...
@@ -87,6 +85,8 @@ class PagesDomain < ActiveRecord::Base
...
@@ -87,6 +85,8 @@ class PagesDomain < ActiveRecord::Base
nil
nil
end
end
private
def
update
def
update
::
Projects
::
UpdatePagesConfigurationService
.
new
(
project
).
execute
::
Projects
::
UpdatePagesConfigurationService
.
new
(
project
).
execute
end
end
...
...
app/views/projects/pages/_list.html.haml
View file @
0552c0b6
.panel.panel-default
-
if
@domains
.
any?
.panel-heading
.panel.panel-default
Domains (
#{
@domains
.
count
}
)
.panel-heading
%ul
.well-list
Domains (
#{
@domains
.
count
}
)
-
@domains
.
each
do
|
domain
|
%ul
.well-list
%li
-
@domains
.
each
do
|
domain
|
.pull-right
%li
=
link_to
'Details'
,
namespace_project_page_path
(
@project
.
namespace
,
@project
,
domain
),
class:
"btn btn-sm btn-grouped"
.pull-right
=
link_to
'Remove'
,
namespace_project_page_path
(
@project
.
namespace
,
@project
,
domain
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
"btn btn-remove btn-sm btn-grouped"
=
link_to
'Details'
,
namespace_project_page_path
(
@project
.
namespace
,
@project
,
domain
),
class:
"btn btn-sm btn-grouped"
.clearfix
=
link_to
'Remove'
,
namespace_project_page_path
(
@project
.
namespace
,
@project
,
domain
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
"btn btn-remove btn-sm btn-grouped"
%span
=
link_to
domain
.
domain
,
domain
.
url
.clearfix
%p
%span
=
link_to
domain
.
domain
,
domain
.
url
-
if
domain
.
subject
%p
%span
.label.label-gray
Certificate:
#{
domain
.
subject
}
-
if
domain
.
subject
-
if
domain
.
expired?
%span
.label.label-gray
Certificate:
#{
domain
.
subject
}
%span
.label.label-danger
Expired
-
if
domain
.
expired?
%span
.label.label-danger
Expired
app/views/projects/pages/show.html.haml
View file @
0552c0b6
-
page_title
"
#{
@domain
.
domain
}
"
,
"Pages Domain"
-
page_title
"
#{
@domain
.
domain
}
"
,
"Pages Domain"
%h3
.page-title
%h3
.page-title
#{
@domain
.
domain
}
Pages Domain
.table-holder
.table-holder
%table
.table
%table
.table
...
@@ -14,9 +14,9 @@
...
@@ -14,9 +14,9 @@
%td
%td
Certificate
Certificate
%td
%td
-
if
@domain
.
certificate
-
if
@domain
.
x509
%pre
%pre
=
@domain
.
certificate
.
to_text
=
@domain
.
x509
.
to_text
-
else
-
else
.light
.light
missing
missing
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