diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-23 21:04:03 +0300 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-24 00:11:46 +0300 |
| commit | 3bc866c65ed3eea7244e04fde1e8011cc9e94b51 (patch) | |
| tree | a1c05278bdce53200040182970904504a896c5d4 /app | |
| parent | 6a762b10bec144fad79499db406db063e077aa66 (diff) | |
Merge branch 'fix-spam-submit-button' into 'master'
Also check if Akismet is enabled, before showing the `Submit as spam` button.
Fixes #21229
See merge request !5948
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 |