Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/api/wikis.rb b/lib/api/wikis.rb
index e90d88940a5..12dbf4792d6 100644
--- a/lib/api/wikis.rb
+++ b/lib/api/wikis.rb
@@ -12,7 +12,7 @@ module API
       params :common_wiki_page_params do
         optional :format,
           type: String,
-          values: Wiki::MARKUPS.values.map(&:to_s),
+          values: Wiki::VALID_USER_MARKUPS.keys.map(&:to_s),
           default: 'markdown',
           desc: 'Format of a wiki page. Available formats are markdown, rdoc, asciidoc and org'
       end
@@ -48,7 +48,7 @@ module API
           optional :version, type: String, desc: 'The version hash of a wiki page'
           optional :render_html, type: Boolean, default: false, desc: 'Render content to HTML'
         end
-        get ':id/wikis/:slug' do
+        get ':id/wikis/:slug', urgency: :low do
           authorize! :read_wiki, container
 
           present wiki_page(params[:version]), with: Entities::WikiPage, render_html: params[:render_html]
@@ -136,7 +136,7 @@ module API
 
           if result[:status] == :success
             status(201)
-            present OpenStruct.new(result[:result]), with: Entities::WikiAttachment
+            present result[:result], with: Entities::WikiAttachment
           else
             render_api_error!(result[:message], 400)
           end