Commit b91754b9 authored by Markus Koller's avatar Markus Koller

Merge branch 'fj-fix-bug-destroying-wiki-page' into 'master'

Fix typo showing error message after destroy page

See merge request gitlab-org/gitlab!62478
parents 1a5f2e17 115ab6ee
...@@ -177,7 +177,7 @@ module WikiActions ...@@ -177,7 +177,7 @@ module WikiActions
redirect_to wiki_path(wiki), redirect_to wiki_path(wiki),
status: :found status: :found
else else
@error = response @error = response.message
render 'shared/wikis/edit' render 'shared/wikis/edit'
end end
end end
......
...@@ -486,7 +486,7 @@ RSpec.shared_examples 'wiki controller actions' do ...@@ -486,7 +486,7 @@ RSpec.shared_examples 'wiki controller actions' do
end.not_to change { wiki.list_pages.size } end.not_to change { wiki.list_pages.size }
expect(response).to render_template('shared/wikis/edit') expect(response).to render_template('shared/wikis/edit')
expect(assigns(:error).message).to eq('Could not delete wiki page') expect(assigns(:error)).to eq('Could not delete wiki page')
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