Merge branch 'sh-fix-spam-update-404' into 'master'

Fix 404 error after a user edits an issue description and solves the reCAPTCHA

Closes #41445

See merge request gitlab-org/gitlab-ce!16167

app/views/shared/_recaptcha_form.html.haml

@@ -1,9 +1,10 @@
 - resource_name = spammable.class.model_name.singular
 - humanized_resource_name = spammable.class.model_name.human.downcase
 - script = local_assigns.fetch(:script, true)
+- method = params[:action] == 'create' ? :post : :put
 - has_submit = local_assigns.fetch(:has_submit, true)
 
-= form_for resource_name, method: :post, html: { class: 'recaptcha-form js-recaptcha-form' } do |f|
+= form_for resource_name, method: method, html: { class: 'recaptcha-form js-recaptcha-form' } do |f|
   .recaptcha
     - params[resource_name].each do |field, value|
       = hidden_field(resource_name, field, value: value)

changelogs/unreleased/sh-fix-spam-update-404.yml

@@ -0,0 +1,5 @@
+---
+title: Fix 404 errors after a user edits an issue description and solves the reCAPTCHA
+merge_request:
+author:
+type: fixed