Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatricio Cano <suprnova32@gmail.com>2016-08-03 00:21:57 +0300
committerPatricio Cano <suprnova32@gmail.com>2016-08-15 21:18:15 +0300
commit96399a81cbb2e8a0f666241eeaff7cc784c26983 (patch)
tree7123e352717a846300c031cb884028fbd0a7f1d3 /app/models/concerns/spammable.rb
parentabf2dcd25c4a176801314872733ede91297d1ab0 (diff)
Allow `Issue` to be submitted as spam
- Added controller actions as reusable concerns - Added controller tests
Diffstat (limited to 'app/models/concerns/spammable.rb')
-rw-r--r--app/models/concerns/spammable.rb18
1 files changed, 15 insertions, 3 deletions
diff --git a/app/models/concerns/spammable.rb b/app/models/concerns/spammable.rb
index 5c75275b6e2..f272e7c5a55 100644
--- a/app/models/concerns/spammable.rb
+++ b/app/models/concerns/spammable.rb
@@ -22,7 +22,7 @@ module Spammable
def can_be_submitted?
if user_agent_detail
- user_agent_detail.submittable?
+ user_agent_detail.submittable? && akismet_enabled?
else
false
end
@@ -41,6 +41,14 @@ module Spammable
@spam
end
+ def submitted?
+ if user_agent_detail
+ user_agent_detail.submitted
+ else
+ false
+ end
+ end
+
def check_for_spam
self.errors.add(:base, "Your #{self.class.name.underscore} has been recognized as spam and has been discarded.") if spam?
end
@@ -53,17 +61,21 @@ module Spammable
end
end
+ def to_ability_name
+ self.class.to_s.underscore
+ end
+
# Override this method if an additional check is needed before calling Akismet
def check_for_spam?
akismet_enabled?
end
def spam_title
- raise 'Implement in included model!'
+ raise NotImplementedError
end
def spam_description
- raise 'Implement in included model!'
+ raise NotImplementedError
end
private