summaryrefslogtreecommitdiff
path: root/app/controllers/projects/wikis_controller.rb
diff options
context:
space:
mode:
authorDongqing Hu <sorra@outlook.com>2017-03-20 13:53:23 +0000
committerRémy Coutable <remy@rymai.me>2017-03-20 13:53:23 +0000
commit2dd9b8a38ad545c98355115589a9060b93de0b03 (patch)
tree2f87f6d4a2b120696c24a74a46551859e865bdf4 /app/controllers/projects/wikis_controller.rb
parent915af2dc5ae903d0007f5c2c75518483e00ab610 (diff)
downloadgitlab-ce-2dd9b8a38ad545c98355115589a9060b93de0b03.tar.gz
Fix Project Wiki update
Diffstat (limited to 'app/controllers/projects/wikis_controller.rb')
-rw-r--r--app/controllers/projects/wikis_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb
index 8b6c83d4fed..f210f7e61d2 100644
--- a/app/controllers/projects/wikis_controller.rb
+++ b/app/controllers/projects/wikis_controller.rb
@@ -45,8 +45,9 @@ class Projects::WikisController < Projects::ApplicationController
return render('empty') unless can?(current_user, :create_wiki, @project)
@page = @project_wiki.find_page(params[:id])
+ @page = WikiPages::UpdateService.new(@project, current_user, wiki_params).execute(@page)
- if @page = WikiPages::UpdateService.new(@project, current_user, wiki_params).execute(@page)
+ if @page.valid?
redirect_to(
namespace_project_wiki_path(@project.namespace, @project, @page),
notice: 'Wiki was successfully updated.'