diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-13 06:10:15 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-13 06:10:15 +0000 |
| commit | e9626c2383e1bbf325a302bb840891c3c7b8cb07 (patch) | |
| tree | 8d2f647cebaa4df8cd4e0c15578344655ea179ec /app/controllers | |
| parent | ed01bf9b255ebcaafdf07e0d9a54ce6886d9fdc7 (diff) | |
| download | gitlab-ce-e9626c2383e1bbf325a302bb840891c3c7b8cb07.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/spammable_actions/captcha_check/json_format_actions_support.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/spammable_actions/captcha_check/json_format_actions_support.rb b/app/controllers/concerns/spammable_actions/captcha_check/json_format_actions_support.rb index 9fa448a9abb..0bfea05abc7 100644 --- a/app/controllers/concerns/spammable_actions/captcha_check/json_format_actions_support.rb +++ b/app/controllers/concerns/spammable_actions/captcha_check/json_format_actions_support.rb @@ -18,7 +18,7 @@ module SpammableActions::CaptchaCheck::JsonFormatActionsSupport def with_captcha_check_json_format(&block) # NOTE: "409 - Conflict" seems to be the most appropriate HTTP status code for a response # which requires a CAPTCHA to be solved in order for the request to be resubmitted. - # See https://stackoverflow.com/q/26547466/25192 + # https://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.10 captcha_render_lambda = -> { render json: spam_action_response_fields(spammable), status: :conflict } with_captcha_check_common(captcha_render_lambda: captcha_render_lambda, &block) end |