Commit 19de0517 authored by Shinya Maeda's avatar Shinya Maeda

Merge branch 'russell/edit-pages-dns-to-use-alias' into 'master'

Use ALIAS instead of CNAME

See merge request gitlab-org/gitlab!75589
parents 5c889016 0d571851
- verification_enabled = Gitlab::CurrentSettings.pages_domain_verification_enabled? - verification_enabled = Gitlab::CurrentSettings.pages_domain_verification_enabled?
- dns_record = "#{domain_presenter.domain} CNAME #{domain_presenter.project.pages_subdomain}.#{Settings.pages.host}." - dns_record = "#{domain_presenter.domain} ALIAS #{domain_presenter.project.pages_subdomain}.#{Settings.pages.host}."
.form-group.border-section .form-group.border-section
.row .row
......
...@@ -177,11 +177,11 @@ RSpec.describe 'User adds pages domain', :js do ...@@ -177,11 +177,11 @@ RSpec.describe 'User adds pages domain', :js do
expect(domain.key).to be_nil expect(domain.key).to be_nil
end end
it 'shows the DNS CNAME record' do it 'shows the DNS ALIAS record' do
visit project_pages_path(project) visit project_pages_path(project)
within('#content-body') { click_link 'Edit' } within('#content-body') { click_link 'Edit' }
expect(page).to have_field :domain_dns, with: "#{domain.domain} CNAME #{domain.project.pages_subdomain}.#{Settings.pages.host}." expect(page).to have_field :domain_dns, with: "#{domain.domain} ALIAS #{domain.project.pages_subdomain}.#{Settings.pages.host}."
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment