summaryrefslogtreecommitdiff
path: root/app/services/wiki_pages
diff options
context:
space:
mode:
authorHiroyuki Sato <h-sato@ruby-dev.jp>2017-03-04 23:03:14 +0900
committerHiroyuki Sato <sathiroyuki@gmail.com>2017-03-08 18:42:50 +0900
commita5521bad4012a9eea21cb067271c8ec1810c6d8c (patch)
tree3544226812c93e9abfcaceafd939fc4a168ecd61 /app/services/wiki_pages
parente78a366925553a1268f8dc6e0d57342053a3240a (diff)
downloadgitlab-ce-a5521bad4012a9eea21cb067271c8ec1810c6d8c.tar.gz
Prevent concurrent editing wiki
Diffstat (limited to 'app/services/wiki_pages')
-rw-r--r--app/services/wiki_pages/update_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/wiki_pages/update_service.rb b/app/services/wiki_pages/update_service.rb
index 8f6a50da838..1046bb3be01 100644
--- a/app/services/wiki_pages/update_service.rb
+++ b/app/services/wiki_pages/update_service.rb
@@ -1,7 +1,7 @@
module WikiPages
class UpdateService < WikiPages::BaseService
def execute(page)
- if page.update(@params[:content], @params[:format], @params[:message])
+ if page.update(@params[:content], @params[:format], @params[:message], @params[:last_commit_sha])
execute_hooks(page, 'update')
end