diff options
| author | Francisco Javier López <fjlopez@gitlab.com> | 2018-02-05 17:17:21 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-05 17:17:21 +0000 |
| commit | 27c08a16891193227fc83bf4692b4d31a3b2539f (patch) | |
| tree | ecf87006574bee3e9ede3cd3ac9b3ac4bda6f427 /app/controllers/projects/wikis_controller.rb | |
| parent | 0a30a9ea595530499e2d3ae8062506b0a94eebad (diff) | |
| download | gitlab-ce-27c08a16891193227fc83bf4692b4d31a3b2539f.tar.gz | |
Allow moving wiki pages from the UI
Diffstat (limited to 'app/controllers/projects/wikis_controller.rb')
| -rw-r--r-- | app/controllers/projects/wikis_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb index 292e4158f8b..fde96cbd35d 100644 --- a/app/controllers/projects/wikis_controller.rb +++ b/app/controllers/projects/wikis_controller.rb @@ -54,8 +54,8 @@ class Projects::WikisController < Projects::ApplicationController else render 'edit' end - rescue WikiPage::PageChangedError - @conflict = true + rescue WikiPage::PageChangedError, WikiPage::PageRenameError => e + @error = e render 'edit' end |