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
361047a7
Commit
361047a7
authored
Feb 15, 2016
by
Kamil Trzcinski
Committed by
James Edwards-Jones
Jan 31, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated according to comments
parent
fd7756ec
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
13 deletions
+11
-13
app/models/pages_domain.rb
app/models/pages_domain.rb
+2
-2
app/services/projects/update_pages_service.rb
app/services/projects/update_pages_service.rb
+1
-2
app/views/projects/pages/show.html.haml
app/views/projects/pages/show.html.haml
+3
-3
app/views/projects/pages_domains/_form.html.haml
app/views/projects/pages_domains/_form.html.haml
+3
-4
app/views/projects/pages_domains/new.html.haml
app/views/projects/pages_domains/new.html.haml
+1
-1
app/views/projects/pages_domains/show.html.haml
app/views/projects/pages_domains/show.html.haml
+1
-1
No files found.
app/models/pages_domain.rb
View file @
361047a7
...
@@ -24,9 +24,9 @@ class PagesDomain < ActiveRecord::Base
...
@@ -24,9 +24,9 @@ class PagesDomain < ActiveRecord::Base
return
unless
domain
return
unless
domain
if
certificate
if
certificate
return
"https://
#{
domain
}
"
"https://
#{
domain
}
"
else
else
return
"http://
#{
domain
}
"
"http://
#{
domain
}
"
end
end
end
end
...
...
app/services/projects/update_pages_service.rb
View file @
361047a7
module
Projects
module
Projects
class
class
UpdatePagesService
<
BaseService
UpdatePagesService
<
BaseService
BLOCK_SIZE
=
32
.
kilobytes
BLOCK_SIZE
=
32
.
kilobytes
MAX_SIZE
=
1
.
terabyte
MAX_SIZE
=
1
.
terabyte
SITE_PATH
=
'public/'
SITE_PATH
=
'public/'
...
...
app/views/projects/pages/show.html.haml
View file @
361047a7
-
page_title
"Pages"
-
page_title
'Pages'
%h3
.page_title
%h3
.page_title
Pages
Pages
-
if
Gitlab
.
config
.
pages
.
external_http
||
Gitlab
.
config
.
pages
.
external_https
-
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
%i
.fa.fa-plus
New Domain
New Domain
%p
.light
%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
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.
you can deploy static pages for your individual projects, your user or your group.
...
...
app/views/projects/pages_domains/_form.html.haml
View file @
361047a7
...
@@ -10,22 +10,21 @@
...
@@ -10,22 +10,21 @@
Domain
Domain
.col-sm-10
.col-sm-10
=
f
.
text_field
:domain
,
required:
true
,
autocomplete:
'off'
,
class:
'form-control'
=
f
.
text_field
:domain
,
required:
true
,
autocomplete:
'off'
,
class:
'form-control'
%span
.help-inline
* required
-
if
Gitlab
.
config
.
pages
.
external_https
-
if
Gitlab
.
config
.
pages
.
external_https
.form-group
.form-group
=
f
.
label
:certificate
,
class:
'control-label'
do
=
f
.
label
:certificate
,
class:
'control-label'
do
Certificate (PEM)
Certificate (PEM)
.col-sm-10
.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
%span
.help-inline
Upload a certificate for your domain with all intermediates
.form-group
.form-group
=
f
.
label
:key
,
class:
'control-label'
do
=
f
.
label
:key
,
class:
'control-label'
do
Key (PEM)
Key (PEM)
.col-sm-10
.col-sm-10
=
f
.
text_area
:key
,
rows:
5
,
class:
'form-control'
,
value:
''
=
f
.
text_area
:key
,
rows:
5
,
class:
'form-control'
%span
.help-inline
Upload a
certificate for your domain with all intermediates
%span
.help-inline
Upload a
private key for your certificate
-
else
-
else
.nothing-here-block
.nothing-here-block
Support for custom certificates is disabled.
Support for custom certificates is disabled.
...
...
app/views/projects/pages_domains/new.html.haml
View file @
361047a7
-
page_title
'
Pages
'
-
page_title
'
New Pages Domain
'
%h3
.page_title
%h3
.page_title
New Pages Domain
New Pages Domain
%hr
.clearfix
%hr
.clearfix
...
...
app/views/projects/pages_domains/show.html.haml
View file @
361047a7
-
page_title
"
#{
@domain
.
domain
}
"
,
"Pages Domain"
-
page_title
"
#{
@domain
.
domain
}
"
,
'Pages Domains'
%h3
.page-title
%h3
.page-title
Pages Domain
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