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.lock | |
| 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.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 418f8ee2af2..62937ab6fd2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,6 +49,7 @@ GEM addressable (2.3.8) after_commit_queue (1.3.0) activerecord (>= 3.0) + akismet (2.0.0) allocations (1.0.3) annotate (2.6.10) activerecord (>= 3.2, <= 4.3) @@ -881,6 +882,7 @@ DEPENDENCIES acts-as-taggable-on (~> 3.4) addressable (~> 2.3.8) after_commit_queue + akismet (~> 2.0) allocations (~> 1.0) annotate (~> 2.6.0) asana (~> 0.4.0) |