diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-07-27 22:36:43 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-07-27 22:36:43 +0300 |
commit | f6063baed4e19eed2c1dd7549ede0692f3250df8 (patch) | |
tree | f9ffe0d6ac6efefe300b7ca4881e97426a3d39ab /app/controllers | |
parent | ce31fb48564d349875b8191c6db91936b8a094ec (diff) | |
parent | f01fce7f4683e06e83d3f91d38ca5b749e27e7ec (diff) |
Merge branch 'akismet-ui-check' into 'master'
Submit new issues created via the WebUI or API to Akismet for spam check on public projects.
## What does this MR do?
Submit new issues created via the WebUI by non project members to Akismet for spam check.
## Why was this MR needed?
Support for Akismet was added only to the API with !2266. This MR builds on that functionality to also check issues submitted via the WebUI for spam.
## What are the relevant issue numbers?
Related to:
- #5573
- #5932
- gitlab-com/infrastructure#14
- gitlab-com/support#61
- !2266
cc @stanhu @MrChrisW
See merge request !5333
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/projects/issues_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 91ff9407216..3c6f29ac0ba 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -82,7 +82,7 @@ class Projects::IssuesController < Projects::ApplicationController end def create - @issue = Issues::CreateService.new(project, current_user, issue_params).execute + @issue = Issues::CreateService.new(project, current_user, issue_params.merge(request: request)).execute respond_to do |format| format.html do @@ -92,7 +92,7 @@ class Projects::IssuesController < Projects::ApplicationController render :new end end - format.js do |format| + format.js do @link = @issue.attachment.url.to_js end end |