diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-22 10:13:20 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-22 10:13:20 +0000 |
commit | 7e8a6a63af2138c5f3f2030ef8c65e8d4815eed3 (patch) | |
tree | e33f0190509c5793c67f5589bc455f53a529efc4 /lib/api/snippets.rb | |
parent | 065a52c8144e621f699762b0206a14a010897254 (diff) | |
parent | 2ace39f2420abf018ceef6aaad52e4917bcbab7d (diff) | |
download | gitlab-ce-7e8a6a63af2138c5f3f2030ef8c65e8d4815eed3.tar.gz |
Merge branch '28093-snippet-and-issue-spam-check-on-edit' into 'master'
Spam check and reCAPTCHA improvements
Closes #28093
See merge request !9248
Diffstat (limited to 'lib/api/snippets.rb')
-rw-r--r-- | lib/api/snippets.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/api/snippets.rb b/lib/api/snippets.rb index eb9ece49e7f..ac03fbd2a3d 100644 --- a/lib/api/snippets.rb +++ b/lib/api/snippets.rb @@ -67,6 +67,8 @@ module API attrs = declared_params(include_missing: false).merge(request: request, api: true) snippet = CreateSnippetService.new(nil, current_user, attrs).execute + render_spam_error! if snippet.spam? + if snippet.persisted? present snippet, with: Entities::PersonalSnippet else @@ -93,9 +95,12 @@ module API return not_found!('Snippet') unless snippet authorize! :update_personal_snippet, snippet - attrs = declared_params(include_missing: false) + attrs = declared_params(include_missing: false).merge(request: request, api: true) UpdateSnippetService.new(nil, current_user, snippet, attrs).execute + + render_spam_error! if snippet.spam? + if snippet.persisted? present snippet, with: Entities::PersonalSnippet else |