Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
553ec2973e04
Commit
361047a7
authored
Feb 15, 2016
by
Kamil Trzcinski
Committed by
James Edwards-Jones
Jan 31, 2017
Browse files
Updated according to comments
parent
99a81e29f585
Changes
6
Hide whitespace changes
Inline
Side-by-side
app/models/pages_domain.rb
View file @
553ec297
...
...
@@ -24,9 +24,9 @@ def url
return
unless
domain
if
certificate
return
"https://
#{
domain
}
"
"https://
#{
domain
}
"
else
return
"http://
#{
domain
}
"
"http://
#{
domain
}
"
end
end
...
...
app/services/projects/update_pages_service.rb
View file @
553ec297
module
Projects
class
UpdatePagesService
<
BaseService
class
UpdatePagesService
<
BaseService
BLOCK_SIZE
=
32
.
kilobytes
MAX_SIZE
=
1
.
terabyte
SITE_PATH
=
'public/'
...
...
app/views/projects/pages/show.html.haml
View file @
553ec297
-
page_title
"
Pages
"
-
page_title
'
Pages
'
%h3
.page_title
Pages
-
if
Gitlab
.
config
.
pages
.
external_http
||
Gitlab
.
config
.
pages
.
external_https
=
link_to
new_namespace_project_pages_domain_path
(
@project
.
namespace
,
@project
),
class:
"
btn btn-new pull-right
"
,
title:
"
New Domain
"
do
=
link_to
new_namespace_project_pages_domain_path
(
@project
.
namespace
,
@project
),
class:
'
btn btn-new pull-right
'
,
title:
'
New Domain
'
do
%i
.fa.fa-plus
New Domain
%p
.light
With GitLab Pages you can host
for free
your static websites on GitLab.
With GitLab Pages you can host your static websites on GitLab.
Combined with the power of GitLab CI and the help of GitLab Runner
you can deploy static pages for your individual projects, your user or your group.
...
...
app/views/projects/pages_domains/_form.html.haml
View file @
553ec297
...
...
@@ -10,22 +10,21 @@
Domain
.col-sm-10
=
f
.
text_field
:domain
,
required:
true
,
autocomplete:
'off'
,
class:
'form-control'
%span
.help-inline
* required
-
if
Gitlab
.
config
.
pages
.
external_https
.form-group
=
f
.
label
:certificate
,
class:
'control-label'
do
Certificate (PEM)
.col-sm-10
=
f
.
text_area
:certificate
,
rows:
5
,
class:
'form-control'
,
value:
''
=
f
.
text_area
:certificate
,
rows:
5
,
class:
'form-control'
%span
.help-inline
Upload a certificate for your domain with all intermediates
.form-group
=
f
.
label
:key
,
class:
'control-label'
do
Key (PEM)
.col-sm-10
=
f
.
text_area
:key
,
rows:
5
,
class:
'form-control'
,
value:
''
%span
.help-inline
Upload a
certificate for your domain with all intermedi
ate
s
=
f
.
text_area
:key
,
rows:
5
,
class:
'form-control'
%span
.help-inline
Upload a
private key for your certific
ate
-
else
.nothing-here-block
Support for custom certificates is disabled.
...
...
app/views/projects/pages_domains/new.html.haml
View file @
553ec297
-
page_title
'Pages'
-
page_title
'
New
Pages
Domain
'
%h3
.page_title
New Pages Domain
%hr
.clearfix
...
...
app/views/projects/pages_domains/show.html.haml
View file @
553ec297
-
page_title
"
#{
@domain
.
domain
}
"
,
"
Pages Domain
"
-
page_title
"
#{
@domain
.
domain
}
"
,
'
Pages Domain
s'
%h3
.page-title
Pages Domain
...
...
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