diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-02 18:37:40 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-02 18:37:40 +0300 |
| commit | e4c20cd3fe330faa415493ee2fe30dc16fbaca80 (patch) | |
| tree | 0be61b6cc59cf35d81b9271c7603e0d8b203a31c /app/controllers/projects/wikis_controller.rb | |
| parent | 25d6a6c4b528159c288995de4909e6a8da431d0b (diff) | |
| parent | 88958e5a9cd364ae36f3d2837982cedb9239c3bc (diff) | |
Merge branch 'master' into sidebar-fly-out-sub-nav
Diffstat (limited to 'app/controllers/projects/wikis_controller.rb')
| -rw-r--r-- | app/controllers/projects/wikis_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb index ac98470c2b1..968d880886c 100644 --- a/app/controllers/projects/wikis_controller.rb +++ b/app/controllers/projects/wikis_controller.rb @@ -55,6 +55,9 @@ class Projects::WikisController < Projects::ApplicationController else render 'edit' end + rescue WikiPage::PageChangedError + @conflict = true + render 'edit' end def create @@ -119,6 +122,6 @@ class Projects::WikisController < Projects::ApplicationController end def wiki_params - params.require(:wiki).permit(:title, :content, :format, :message) + params.require(:wiki).permit(:title, :content, :format, :message, :last_commit_sha) end end |