diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 18:18:33 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 18:18:33 +0000 |
| commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
| tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /app/controllers/concerns/wiki_actions.rb | |
| parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) | |
| download | gitlab-ce-f64a639bcfa1fc2bc89ca7db268f594306edfd7c.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'app/controllers/concerns/wiki_actions.rb')
| -rw-r--r-- | app/controllers/concerns/wiki_actions.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/concerns/wiki_actions.rb b/app/controllers/concerns/wiki_actions.rb index 4014e4f0024..60ff0a12d0c 100644 --- a/app/controllers/concerns/wiki_actions.rb +++ b/app/controllers/concerns/wiki_actions.rb @@ -112,10 +112,11 @@ module WikiActions wiki_page_path(wiki, page) ) else + @error = response.message render 'shared/wikis/edit' end rescue WikiPage::PageChangedError, WikiPage::PageRenameError => e - @error = e + @error = e.message render 'shared/wikis/edit' end # rubocop:enable Gitlab/ModuleWithInstanceVariables |