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/models | |
| 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/models')
| -rw-r--r-- | app/models/project.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 0a7e7617d9b..cc530076bf7 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -752,13 +752,14 @@ class Project < ActiveRecord::Base Gitlab::Routing.url_helpers.project_url(self) end - def new_issue_address(author) + def new_issuable_address(author, address_type) return unless Gitlab::IncomingEmail.supports_issue_creation? && author author.ensure_incoming_email_token! + suffix = address_type == 'merge_request' ? '+merge-request' : '' Gitlab::IncomingEmail.reply_address( - "#{full_path}+#{author.incoming_email_token}") + "#{full_path}#{suffix}+#{author.incoming_email_token}") end def build_commit_note(commit) |