Updated according to comments
This commit is contained in:
parent
fd7756ec37
commit
361047a791
6 changed files with 11 additions and 13 deletions
|
@ -24,9 +24,9 @@ class PagesDomain < ActiveRecord::Base
|
|||
return unless domain
|
||||
|
||||
if certificate
|
||||
return "https://#{domain}"
|
||||
"https://#{domain}"
|
||||
else
|
||||
return "http://#{domain}"
|
||||
"http://#{domain}"
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
module Projects
|
||||
class
|
||||
UpdatePagesService < BaseService
|
||||
class UpdatePagesService < BaseService
|
||||
BLOCK_SIZE = 32.kilobytes
|
||||
MAX_SIZE = 1.terabyte
|
||||
SITE_PATH = 'public/'
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
- 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.
|
||||
|
||||
|
|
|
@ -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 intermediates
|
||||
= f.text_area :key, rows: 5, class: 'form-control'
|
||||
%span.help-inline Upload a private key for your certificate
|
||||
- else
|
||||
.nothing-here-block
|
||||
Support for custom certificates is disabled.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
- page_title 'Pages'
|
||||
- page_title 'New Pages Domain'
|
||||
%h3.page_title
|
||||
New Pages Domain
|
||||
%hr.clearfix
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
- page_title "#{@domain.domain}", "Pages Domain"
|
||||
- page_title "#{@domain.domain}", 'Pages Domains'
|
||||
|
||||
%h3.page-title
|
||||
Pages Domain
|
||||
|
|
Loading…
Reference in a new issue