diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-10 10:53:40 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-10 10:53:40 +0300 |
| commit | cfc792b9ca064990e6540cb742e80529ea669a81 (patch) | |
| tree | 147cd4256319990cebbc02fe8e4fbbbe06f5720a /spec/views | |
| parent | 93c6764dacd4c605027ef1cd367d3aebe420b223 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/views')
| -rw-r--r-- | spec/views/projects/pages_domains/show.html.haml_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/views/projects/pages_domains/show.html.haml_spec.rb b/spec/views/projects/pages_domains/show.html.haml_spec.rb index 331bfe63f28..51c7a08fe96 100644 --- a/spec/views/projects/pages_domains/show.html.haml_spec.rb +++ b/spec/views/projects/pages_domains/show.html.haml_spec.rb @@ -8,6 +8,7 @@ describe 'projects/pages_domains/show' do before do assign(:project, project) assign(:domain, domain) + stub_pages_setting(external_https: true) end context 'when auto_ssl is enabled' do |