diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2017-08-24 08:20:36 +0200 |
|---|---|---|
| committer | Jan Provaznik <jan.provaznik@gmail.com> | 2017-12-05 08:41:58 +0100 |
| commit | 8cce70730c2fb9c705e1f1177f6d1effc665b3c7 (patch) | |
| tree | 658e5a0f245159944f7aefc8155627c29b918d1d /app/workers | |
| parent | a1cd9be42910c89192e82659c09bf0242c8e5dae (diff) | |
| download | gitlab-ce-8cce70730c2fb9c705e1f1177f6d1effc665b3c7.tar.gz | |
Create merge request from email
* new merge request can be created by sending an email to the specific
email address (similar to creating issues by email)
* for the first iteration, source branch must be specified in the mail
subject, other merge request parameters can not be set yet
* user should enable "Receive notifications about your own activity" in
user settings to receive a notification about created merge request
Part of #32878
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/email_receiver_worker.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/workers/email_receiver_worker.rb b/app/workers/email_receiver_worker.rb index 1afa24c8e2a..05cb116a623 100644 --- a/app/workers/email_receiver_worker.rb +++ b/app/workers/email_receiver_worker.rb @@ -39,8 +39,7 @@ class EmailReceiverWorker "You are not allowed to perform this action. If you believe this is in error, contact a staff member." when Gitlab::Email::NoteableNotFoundError "The thread you are replying to no longer exists, perhaps it was deleted? If you believe this is in error, contact a staff member." - when Gitlab::Email::InvalidNoteError, - Gitlab::Email::InvalidIssueError + when Gitlab::Email::InvalidRecordError can_retry = true e.message end |