diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-02-06 16:08:06 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-02-06 16:08:06 +0000 |
| commit | 5db5a9cbd1192d776874a92e0a253c605f3c4417 (patch) | |
| tree | 67be95609ce038ec9c2fbdc45fb491bb223c7137 /app/controllers/projects/wikis_controller.rb | |
| parent | a29f0c28fd07ba14f0d0e5fb9c878a2eb117e388 (diff) | |
| parent | ba62493009c2360018709b660956a6173f3e1515 (diff) | |
| download | gitlab-ce-5db5a9cbd1192d776874a92e0a253c605f3c4417.tar.gz | |
Merge branch 'master' into 'zj-wiki-page-versions'
# Conflicts:
# Gemfile
# Gemfile.lock
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 730f20bc086..c4930d3d18d 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 |