kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Final fixes

Browse source
This commit is contained in:
Kamil Trzcinski 2016-02-16 10:48:51 +01:00 committed by James Edwards-Jones
parent 361047a791
commit 4d23371758
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/gitlab.yml.example
View file

@ -165,8 +165,8 @@ production: &base
host: example.com
port: 80 # Set to 443 if you serve the pages with HTTPS
https: false # Set to true if you serve the pages with HTTPS
# external_http: "1.1.1.1:80" # if defined notifies the GitLab pages do support Custom Domains
# external_https: "1.1.1.1:443" # if defined notifies the GitLab pages do support Custom Domains with Certificates
# external_http: "1.1.1.1:80" # If defined, enables custom domain support in GitLab Pages
# external_https: "1.1.1.1:443" # If defined, enables custom domain and certificate support in GitLab Pages
## Mattermost
## For enabling Add to Mattermost button

22
features/steps/project/pages.rb
View file

@ -4,14 +4,14 @@ class Spinach::Features::ProjectPages < Spinach::FeatureSteps
include SharedProject
step 'pages are enabled' do
Gitlab.config.pages.stub(:enabled).and_return(true)
Gitlab.config.pages.stub(:host).and_return('example.com')
Gitlab.config.pages.stub(:port).and_return(80)
Gitlab.config.pages.stub(:https).and_return(false)
allow(Gitlab.config.pages).to receive(:enabled).and_return(true)
allow(Gitlab.config.pages).to receive(:host).and_return('example.com')
allow(Gitlab.config.pages).to receive(:port).and_return(80)
allow(Gitlab.config.pages).to receive(:https).and_return(false)
end
step 'pages are disabled' do
Gitlab.config.pages.stub(:enabled).and_return(false)
allow(Gitlab.config.pages).to receive(:enabled).and_return(false)
end
step 'I visit the Project Pages' do
@ -48,18 +48,18 @@ class Spinach::Features::ProjectPages < Spinach::FeatureSteps
end
step 'support for external domains is disabled' do
Gitlab.config.pages.stub(:external_http).and_return(nil)
Gitlab.config.pages.stub(:external_https).and_return(nil)
allow(Gitlab.config.pages).to receive(:external_http).and_return(nil)
allow(Gitlab.config.pages).to receive(:external_https).and_return(nil)
end
step 'pages are exposed on external HTTP address' do
Gitlab.config.pages.stub(:external_http).and_return('1.1.1.1:80')
Gitlab.config.pages.stub(:external_https).and_return(nil)
allow(Gitlab.config.pages).to receive(:external_http).and_return('1.1.1.1:80')
allow(Gitlab.config.pages).to receive(:external_https).and_return(nil)
end
step 'pages are exposed on external HTTPS address' do
Gitlab.config.pages.stub(:external_http).and_return('1.1.1.1:80')
Gitlab.config.pages.stub(:external_https).and_return('1.1.1.1:443')
allow(Gitlab.config.pages).to receive(:external_http).and_return('1.1.1.1:80')
allow(Gitlab.config.pages).to receive(:external_https).and_return('1.1.1.1:443')
end
step 'I should be able to add a New Domain' do