Merge branch 'master' into 'master'

use create_wiki method on ensure_wiki_exists in update_service

See merge request gitlab-org/gitlab!42910

app/services/projects/update_service.rb

@@ -135,8 +135,8 @@ module Projects
     end
 
     def ensure_wiki_exists
-      ProjectWiki.new(project, project.owner).wiki
-    rescue Wiki::CouldNotCreateWikiError
+      return if project.create_wiki
+
       log_error("Could not create wiki for #{project.full_name}")
       Gitlab::Metrics.counter(:wiki_can_not_be_created_total, 'Counts the times we failed to create a wiki').increment
     end

changelogs/unreleased/42910-use-create-wiki-method-on-ensure-wiki-exists-in-update-service.yml

+---
+title: use create_wiki method on ensure_wiki_exists in update_service
+merge_request: 42910
+author:
+type: fixed