diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-14 18:09:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-14 18:09:44 +0300 |
| commit | 874ead9c3a50de4c4ca4551eaf5b7eb976d26b50 (patch) | |
| tree | 637ee9f2da5e251bc08ebf3e972209d51966bf7c /spec/views | |
| parent | 2e4c4055181eec9186458dd5dd3219c937032ec7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/views')
| -rw-r--r-- | spec/views/projects/pages/show.html.haml_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/views/projects/pages/show.html.haml_spec.rb b/spec/views/projects/pages/show.html.haml_spec.rb index 80410e7bc32..39384484279 100644 --- a/spec/views/projects/pages/show.html.haml_spec.rb +++ b/spec/views/projects/pages/show.html.haml_spec.rb @@ -17,7 +17,7 @@ describe 'projects/pages/show' do assign(:project, project) allow(view).to receive(:current_user).and_return(user) - assign(:domains, [domain]) + assign(:domains, project.pages_domains) end describe 'validation warning' do |