diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-23 18:04:03 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-08-23 18:04:03 +0000 |
| commit | cc8a9d923fca6b852aefc499169dc345ddacf70a (patch) | |
| tree | 4e90cb0c07c03ae38c486d7af4579b5a03cfce12 | |
| parent | d716492a026674717690767fd020819be4042ed7 (diff) | |
| parent | 7e6af85490e289ffcc868390654748009ecc67fa (diff) | |
| download | gitlab-ce-cc8a9d923fca6b852aefc499169dc345ddacf70a.tar.gz | |
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
| -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 |