Merge branch 'update-wiki-existing-page' into 'master'

Return a proper response on WikiUpdatePage failing on DuplicatePageError

Closes #3884

See merge request gitlab-org/gitaly!4033

2 files changed, 4 insertions, 0 deletions

diff --git a/ruby/lib/gitaly_server/wiki_service.rb b/ruby/lib/gitaly_server/wiki_service.rb
index 7c586e93f..1df1cba28 100644
--- a/ruby/lib/gitaly_server/wiki_service.rb
+++ b/ruby/lib/gitaly_server/wiki_service.rb
@@ -107,6 +107,8 @@ module GitalyServer
       wiki.update_page(page_path, title, format.to_sym, content, commit_details)
 
       Gitaly::WikiUpdatePageResponse.new
+    rescue Gitlab::Git::Wiki::DuplicatePageError => e
+      Gitaly::WikiUpdatePageResponse.new(error: e.message.b)
     end
 
     private
diff --git a/ruby/lib/gitlab/git/wiki.rb b/ruby/lib/gitlab/git/wiki.rb
index 506b4489f..b7779b6c0 100644
--- a/ruby/lib/gitlab/git/wiki.rb
+++ b/ruby/lib/gitlab/git/wiki.rb
@@ -152,6 +152,8 @@ module Gitlab
           gollum_wiki.update_page(page, page.name, format, content, committer: committer)
           gollum_wiki.rename_page(page, title, committer: committer)
         end
+      rescue Gollum::DuplicatePageError => e
+        raise Gitlab::Git::Wiki::DuplicatePageError, e.message
       end
 
       def gollum_find_page(title:, version: nil, dir: nil)