diff options
author | Patricio Cano <suprnova32@gmail.com> | 2016-08-22 21:36:04 -0500 |
---|---|---|
committer | Patricio Cano <suprnova32@gmail.com> | 2016-08-22 21:36:04 -0500 |
commit | 7e6af85490e289ffcc868390654748009ecc67fa (patch) | |
tree | f91d7376e752db7d09126c425c9526a3e554d4d7 /app | |
parent | 148b8487b817a0c8854c6842109ce1abc5aa4306 (diff) | |
download | gitlab-ce-7e6af85490e289ffcc868390654748009ecc67fa.tar.gz |
Also check if Akismet is enabled, before showing the `Submit as spam` button.fix-spam-submit-button
Diffstat (limited to 'app')
-rw-r--r-- | app/models/concerns/spammable.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/spammable.rb b/app/models/concerns/spammable.rb index ce54fe5d3bf..1aa97debe42 100644 --- a/app/models/concerns/spammable.rb +++ b/app/models/concerns/spammable.rb @@ -23,7 +23,7 @@ module Spammable def submittable_as_spam? if user_agent_detail - user_agent_detail.submittable? + user_agent_detail.submittable? && current_application_settings.akismet_enabled else false end |