diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 12:09:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 12:09:11 +0300 |
commit | 0388886f9439fa93efea29a159522aec5643f7c8 (patch) | |
tree | 9a4b2305088e62a9745ce598b45aa34e39e59642 /app/controllers/concerns | |
parent | 8c9dc985b90c353b33cb829caf51f8320171bc15 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/concerns')
-rw-r--r-- | app/controllers/concerns/spammable_actions.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/concerns/spammable_actions.rb b/app/controllers/concerns/spammable_actions.rb index 9ec8f930a78..e9bba904dab 100644 --- a/app/controllers/concerns/spammable_actions.rb +++ b/app/controllers/concerns/spammable_actions.rb @@ -11,7 +11,7 @@ module SpammableActions end def mark_as_spam - if Spam::MarkAsSpamService.new(spammable: spammable).execute + if Spam::MarkAsSpamService.new(target: spammable).execute redirect_to spammable_path, notice: _("%{spammable_titlecase} was submitted to Akismet successfully.") % { spammable_titlecase: spammable.spammable_entity_type.titlecase } else redirect_to spammable_path, alert: _('Error with Akismet. Please check the logs for more info.') @@ -42,7 +42,7 @@ module SpammableActions end format.json do - locals = { spammable: spammable, script: false, has_submit: false } + locals = { target: spammable, script: false, has_submit: false } recaptcha_html = render_to_string(partial: 'shared/recaptcha_form', formats: :html, locals: locals) render json: { recaptcha_html: recaptcha_html } |