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 /Gemfile | |
| 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 'Gemfile')
| -rw-r--r-- | Gemfile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -36,8 +36,9 @@ gem 'omniauth-twitter', '~> 1.2.0' gem 'omniauth_crowd', '~> 2.2.0' gem 'rack-oauth2', '~> 1.2.1' -# reCAPTCHA protection +# Spam and anti-bot protection gem 'recaptcha', require: 'recaptcha/rails' +gem 'akismet', '~> 2.0' # Two-factor authentication gem 'devise-two-factor', '~> 2.0.0' |