Updated according to comments

6 files changed, 11 insertions, 13 deletions

diff --git a/app/models/pages_domain.rb b/app/models/pages_domain.rb
index 83fdc1c630d..9155e57331d 100644
--- a/app/models/pages_domain.rb
+++ b/app/models/pages_domain.rb
@@ -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
 
diff --git a/app/services/projects/update_pages_service.rb b/app/services/projects/update_pages_service.rb
index a9979bf1e96..ceabd29fd52 100644
--- a/app/services/projects/update_pages_service.rb
+++ b/app/services/projects/update_pages_service.rb
@@ -1,6 +1,5 @@
 module Projects
-  class
-  UpdatePagesService < BaseService
+  class UpdatePagesService < BaseService
     BLOCK_SIZE = 32.kilobytes
     MAX_SIZE = 1.terabyte
     SITE_PATH = 'public/'
diff --git a/app/views/projects/pages/show.html.haml b/app/views/projects/pages/show.html.haml
index 9be6f8678cf..f4ca33f418b 100644
--- a/app/views/projects/pages/show.html.haml
+++ b/app/views/projects/pages/show.html.haml
@@ -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.
 
diff --git a/app/views/projects/pages_domains/_form.html.haml b/app/views/projects/pages_domains/_form.html.haml
index 5458f9e7734..e97d19653d5 100644
--- a/app/views/projects/pages_domains/_form.html.haml
+++ b/app/views/projects/pages_domains/_form.html.haml
@@ -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.
diff --git a/app/views/projects/pages_domains/new.html.haml b/app/views/projects/pages_domains/new.html.haml
index 2609df62aac..e1477c71d06 100644
--- a/app/views/projects/pages_domains/new.html.haml
+++ b/app/views/projects/pages_domains/new.html.haml
@@ -1,4 +1,4 @@
-- page_title 'Pages'
+- page_title 'New Pages Domain'
 %h3.page_title
   New Pages Domain
 %hr.clearfix
diff --git a/app/views/projects/pages_domains/show.html.haml b/app/views/projects/pages_domains/show.html.haml
index e4c5922d863..52dddb052a7 100644
--- a/app/views/projects/pages_domains/show.html.haml
+++ b/app/views/projects/pages_domains/show.html.haml
@@ -1,4 +1,4 @@
-- page_title "#{@domain.domain}", "Pages Domain"
+- page_title "#{@domain.domain}", 'Pages Domains'
 
 %h3.page-title
   Pages Domain