diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-02-03 01:26:30 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-02-03 01:26:30 +0000 |
| commit | 8a85906a74aff295074c79619d491bea9c947e05 (patch) | |
| tree | fc4aa22c44ce08a4bf6b823090e5c499b11ecc4a /app/models | |
| parent | fcfafffef5535295e310407a7e3bb4a20ff2fd55 (diff) | |
| parent | dffacbb12c0abd4edf677aed2d9e201b41fd2dae (diff) | |
| download | gitlab-ce-8a85906a74aff295074c79619d491bea9c947e05.tar.gz | |
Merge branch 'support-akismet' into 'master'
Support Akismet spam checking for creation of issues via API
Currently any spam detected by Akismet for non-members via API will
be logged in a separate table in the admin page.
Closes #5612
See merge request !2266
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/application_setting.rb | 8 | ||||
| -rw-r--r-- | app/models/spam_log.rb | 10 | ||||
| -rw-r--r-- | app/models/spam_report.rb | 5 | ||||
| -rw-r--r-- | app/models/user.rb | 1 |
4 files changed, 23 insertions, 1 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 59563b8823c..9cafc78f761 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -88,6 +88,10 @@ class ApplicationSetting < ActiveRecord::Base presence: true, if: :sentry_enabled + validates :akismet_api_key, + presence: true, + if: :akismet_enabled + validates_each :restricted_visibility_levels do |record, attr, value| unless value.nil? value.each do |level| @@ -143,7 +147,9 @@ class ApplicationSetting < ActiveRecord::Base shared_runners_enabled: Settings.gitlab_ci['shared_runners_enabled'], max_artifacts_size: Settings.artifacts['max_size'], require_two_factor_authentication: false, - two_factor_grace_period: 48 + two_factor_grace_period: 48, + recaptcha_enabled: false, + akismet_enabled: false ) end diff --git a/app/models/spam_log.rb b/app/models/spam_log.rb new file mode 100644 index 00000000000..12df68ef83b --- /dev/null +++ b/app/models/spam_log.rb @@ -0,0 +1,10 @@ +class SpamLog < ActiveRecord::Base + belongs_to :user + + validates :user, presence: true + + def remove_user + user.block + user.destroy + end +end diff --git a/app/models/spam_report.rb b/app/models/spam_report.rb new file mode 100644 index 00000000000..cdc7321b08e --- /dev/null +++ b/app/models/spam_report.rb @@ -0,0 +1,5 @@ +class SpamReport < ActiveRecord::Base + belongs_to :user + + validates :user, presence: true +end diff --git a/app/models/user.rb b/app/models/user.rb index 4214f01f6a4..234c1cd89f9 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -138,6 +138,7 @@ class User < ActiveRecord::Base has_many :assigned_merge_requests, dependent: :destroy, foreign_key: :assignee_id, class_name: "MergeRequest" has_many :oauth_applications, class_name: 'Doorkeeper::Application', as: :owner, dependent: :destroy has_one :abuse_report, dependent: :destroy + has_many :spam_logs, dependent: :destroy has_many :builds, dependent: :nullify, class_name: 'Ci::Build' |