From 3bc866c65ed3eea7244e04fde1e8011cc9e94b51 Mon Sep 17 00:00:00 2001
From: Robert Speicher <robert@gitlab.com>
Date: Tue, 23 Aug 2016 18:04:03 +0000
Subject: 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
---
 app/models/concerns/spammable.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

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
-- 
cgit v1.2.3