diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-05 15:28:49 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-05 15:28:49 +0300 |
| commit | a39d6d896f6a83176c67c6ebc965ce76eab5249c (patch) | |
| tree | e1978336a0d8000440bf01ae7cc3574272c4c6ed /app/controllers | |
| parent | 9f75b7a47fbfe352f7b099769861b1cc0a9617eb (diff) | |
| parent | 8cce70730c2fb9c705e1f1177f6d1effc665b3c7 (diff) | |
Merge branch '32878-merge-request-from-email' into 'master'
Create merge request from email
Closes #32878
See merge request gitlab-org/gitlab-ce!13817
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index a784c6f402a..3882fa4791d 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -133,11 +133,11 @@ class ProjectsController < Projects::ApplicationController redirect_to edit_project_path(@project), status: 302, alert: ex.message end - def new_issue_address + def new_issuable_address return render_404 unless Gitlab::IncomingEmail.supports_issue_creation? current_user.reset_incoming_email_token! - render json: { new_issue_address: @project.new_issue_address(current_user) } + render json: { new_address: @project.new_issuable_address(current_user, params[:issuable_type]) } end def archive |