GitLab FOSS merge requestshttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests2017-12-14T11:15:43Zhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14289WIP: Make notes in discussions In-Reply-To of each other2017-12-14T11:15:43ZToon ClaesWIP: Make notes in discussions In-Reply-To of each other## What does this MR do?
When a note is part of a discussion, the email sent out should be
`In-Reply-To` the previous note in that discussion.
## Screenshots (TODO)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry...## What does this MR do?
When a note is part of a discussion, the email sent out should be
`In-Reply-To` the previous note in that discussion.
## Screenshots (TODO)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [ ] Tests added for this feature/bug
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [ ] Conform by the [merge request performance guides](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes gitlab-org/gitlab-ce#36054Toon ClaesToon Claeshttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13254Don't send rejection mails for all auto-generated mails2017-10-02T07:08:57Zusername-removed-423915Don't send rejection mails for all auto-generated mails## What does this MR do?
Don't send rejection mails for all auto-generated mails
## Are there points in the code the reviewer needs to double check?
We don't need to `include EmailHelpers`. I'll make another merge request to fix other...## What does this MR do?
Don't send rejection mails for all auto-generated mails
## Are there points in the code the reviewer needs to double check?
We don't need to `include EmailHelpers`. I'll make another merge request to fix other occurrences.
## Why was this MR needed?
Try to fight over with https://gitlab.com/gitlab-org/gitlab-ce/issues/28472
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- Tests
- [x] Added for this feature/bug
- Review
- [ ] Has been reviewed by Backend
## What are the relevant issue numbers?
Closes #284729.5username-removed-443319username-removed-443319https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/11014Don't blow up when email has no References header2017-05-10T21:09:26Zusername-removed-443319Don't blow up when email has no References header## What does this MR do?
Don't blow up when the `References` header isn't present and the `To` header doesn't match; raise a normal exception instead.
## Are there points in the code the reviewer needs to double check?
Not sure. Shoul...## What does this MR do?
Don't blow up when the `References` header isn't present and the `To` header doesn't match; raise a normal exception instead.
## Are there points in the code the reviewer needs to double check?
Not sure. Should I be using that fixture?
## Why was this MR needed?
This is a part of fixing https://gitlab.com/gitlab-org/gitlab-ee/issues/2247.
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)9.1Douwe MaanDouwe Maanhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9482add Microsoft Exchange reply by email details2017-03-24T19:25:00Zusername-removed-5332add Microsoft Exchange reply by email details## What does this MR do?
Document Reply by Email with Microsoft Exchange settings, fix https://gitlab.com/gitlab-org/gitlab-ce/issues/28131. Also includes minor cleanup and additions to Reply by Email docs:
* Document that not all featu...## What does this MR do?
Document Reply by Email with Microsoft Exchange settings, fix https://gitlab.com/gitlab-org/gitlab-ce/issues/28131. Also includes minor cleanup and additions to Reply by Email docs:
* Document that not all features work without sub-addressing
* Remove redundant mailroom restart since omnibus already does that
Replace https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9356
/cc @markglenfletcher @lbot @MrChrisW @northrup9.0Achilleas PipinellisAchilleas Pipinellishttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9356add Microsoft Exchange reply by email details2017-02-24T00:08:58Zusername-removed-5332add Microsoft Exchange reply by email details## What does this MR do?
Document Reply by Email with Microsoft Exchange settings, fix https://gitlab.com/gitlab-org/gitlab-ce/issues/28131. Also includes minor cleanup and additions to Reply by Email docs:
* Document that not all fe...## What does this MR do?
Document Reply by Email with Microsoft Exchange settings, fix https://gitlab.com/gitlab-org/gitlab-ce/issues/28131. Also includes minor cleanup and additions to Reply by Email docs:
* Document that not all features work without sub-addressing
* Remove redundant mailroom restart since omnibus already does thatusername-removed-5332username-removed-5332https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9045unwrap links without an href2017-06-20T17:15:51Zusername-removed-28993unwrap links without an href## What does this MR do?
Fixes #27645 by unwrapping links with a blank href, which can be added by outlook.
## Are there points in the code the reviewer needs to double check?
I believe it makes sense for us to do this within Gitlab...## What does this MR do?
Fixes #27645 by unwrapping links with a blank href, which can be added by outlook.
## Are there points in the code the reviewer needs to double check?
I believe it makes sense for us to do this within Gitlab, since it's specific to email. For the rich-text example, Html2Text can do a better job of not creating empty links, but for the client's later example, the entirety of the content is wrapped in a link, so there's not much to be done generically.
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?9.4Douwe MaanDouwe Maanhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/8620Fix References header parser for Microsoft Exchange2017-03-16T12:43:36Zusername-removed-423915Fix References header parser for Microsoft ExchangeFix References header parser for Microsoft Exchange
Microsoft Exchange would append a comma and another
message id into the References header, therefore we'll
need to fallback and parse the header by ourselves.
Closes #26567Fix References header parser for Microsoft Exchange
Microsoft Exchange would append a comma and another
message id into the References header, therefore we'll
need to fallback and parse the header by ourselves.
Closes #265678.17username-removed-443319username-removed-443319https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/8474Fix dead link in Reply by email documentation2017-01-07T21:32:16ZAchilleas PipinellisFix dead link in Reply by email documentationCloses https://gitlab.com/gitlab-org/gitlab-ce/issues/26247.Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/26247.8.16Achilleas PipinellisAchilleas Pipinellishttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/7423Make mail_room idle_timeout option configurable.2016-11-18T21:50:23ZMarin JankovskiMake mail_room idle_timeout option configurable.## What does this MR do?
Allows configuration of idle_timeout for incoming email.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
We had a hardcoded value of 60. For GitLab.com we need thi...## What does this MR do?
Allows configuration of idle_timeout for incoming email.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
We had a hardcoded value of 60. For GitLab.com we need this to be configurable.
## Screenshots (if relevant)
Not relevant.
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/10878.14username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/7397add parsing support for incoming html email2017-02-03T15:52:44Zusername-removed-28993add parsing support for incoming html email## What does this MR do?
Fixes #18388 by adding support for parsing HTML email
## Are there points in the code the reviewer needs to double check?
The new class, Gitlab::Email::HTMLParser, which needs to translate the HTML content to te...## What does this MR do?
Fixes #18388 by adding support for parsing HTML email
## Are there points in the code the reviewer needs to double check?
The new class, Gitlab::Email::HTMLParser, which needs to translate the HTML content to text and also delete replies, as they are not necessarily in the correct format to be caught by EmailReplyParser. The solution I found that should work for any HTML-formatted email is to remove all `<table>` and `<blockquote>` tags. Actual `<table>` elements (to be interpreted by markdown) should already be encoded with e.g. `<table>` - the only failure mode is if there is an *actual* HTML table in the content itself, which we wouldn't be able to support easily anyways.
The gem `html2text` traverses the HTML tree and outputs text - and markdown in the case of HTML links or images.8.14Douwe MaanDouwe Maanhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/7101Updated mail_room and enable sentinel support to Reply by Email2016-10-27T21:23:24ZGabriel MazettoUpdated mail_room and enable sentinel support to Reply by Email## What does this MR do?
* Updates mail_room gem to include Sentinel Support ( [Issue](https://github.com/tpitale/mail_room/issues/55) / [Pull Request](https://github.com/tpitale/mail_room/pull/79) )
* Added sentinel helper methods t...## What does this MR do?
* Updates mail_room gem to include Sentinel Support ( [Issue](https://github.com/tpitale/mail_room/issues/55) / [Pull Request](https://github.com/tpitale/mail_room/pull/79) )
* Added sentinel helper methods to `Gitlab::Redis` to support retrieving configurations for mail_room
* `mail_room.yml` includes `sentinels` listing when available
## Are there points in the code the reviewer needs to double check?
Sentinels is tricky to test, and `mail_room` is even trickier. Locally I've used this gem to help simulate an IMAP server: `git://github.com/y10k/rims.git`
To execute it locally:
Add it to the Gemfile and `bundle install``
```bash
# to execute
bundle exec rims server -u 'user1@domain.tld' -w 'mypassword' -d fakeimap/
# to append mail (get a "full source email file" from a desktop mail client, and dump to a local file):
bundle exec rims imap-append -v -n 127.0.0.1 -o 1430 -w 'mypassword' -u 'user1@domain.tld' fakeimap/mail.txt
```
## Why was this MR needed?
This is part of the effort to enable full Sentinel support in GitLab : #3355
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
#3355
Closes #216458.14Douwe MaanDouwe Maanhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/7068Fix reply-by-email not working due to queue name mismatch2016-10-25T16:39:50ZStan HuFix reply-by-email not working due to queue name mismatchmail_room was configured to deliver mail to the `incoming_email`
queue while `EmailReceiveWorker` was reading the `email_receiver`
queue. Adds a migration that repeats the work of a previous
migration to ensure all mails that wound up in...mail_room was configured to deliver mail to the `incoming_email`
queue while `EmailReceiveWorker` was reading the `email_receiver`
queue. Adds a migration that repeats the work of a previous
migration to ensure all mails that wound up in the old
queue get processed.8.13yorickpeterse-stagingyorickpeterse-staginghttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/7010Preserve note_type and position for notes from emails2016-11-03T17:08:49Zusername-removed-423915Preserve note_type and position for notes from emails## What does this MR do?
Preserve note_type and position for notes from emails
## Why was this MR needed?
Otherwise notes from emails would not attach to the original thread. This is mainly for notes on merge requests.
## Does this M...## What does this MR do?
Preserve note_type and position for notes from emails
## Why was this MR needed?
Otherwise notes from emails would not attach to the original thread. This is mainly for notes on merge requests.
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
- [x] Added for this feature/bug
## What are the relevant issue numbers?
Closes #232088.13username-removed-443319username-removed-443319https://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/4584WIP: Add Exchange Reply by Mail documentation2016-12-05T01:35:07ZAchilleas PipinellisWIP: Add Exchange Reply by Mail documentation## What does this MR do?
This is a continuation/replacement of gitlab-org/gitlab-ce!1624.
It provides documentation on setting up Microsoft's Exchange server to work with
the reply by email feature.
## Does this MR meet the accep...## What does this MR do?
This is a continuation/replacement of gitlab-org/gitlab-ce!1624.
It provides documentation on setting up Microsoft's Exchange server to work with
the reply by email feature.
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)Achilleas PipinellisAchilleas Pipinellishttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/3305Fall back to In-Reply-To and References headers when sub-addressing is not av...2016-09-29T14:57:17Zusername-removed-128633Fall back to In-Reply-To and References headers when sub-addressing is not available_Originally opened at !3024 by @dabit._
- - -
Fixes #2364
Summary of the changes:
- No more need to have the `%{key}` placeholder in the `incoming_email.address`
- The fallback message id format is `reply-[key]@[gitlab_host]`..._Originally opened at !3024 by @dabit._
- - -
Fixes #2364
Summary of the changes:
- No more need to have the `%{key}` placeholder in the `incoming_email.address`
- The fallback message id format is `reply-[key]@[gitlab_host]` (reminder: it doesn't have to be a real email address)
- The fallback message id that includes the reply key is added to both `References` header
- Documentation for the "Reply by email" feature updated8.7Douwe MaanDouwe Maanhttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/1624Add Exchange Reply by Mail documentation2016-06-10T12:50:32Zusername-removed-82025Add Exchange Reply by Mail documentationSorry for the english but, it's not my main language!Sorry for the english but, it's not my main language!8.10Achilleas PipinellisAchilleas Pipinellishttps://staging.gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/1193Expand Reply by email documentation2016-11-18T12:32:40ZDouwe MaanExpand Reply by email documentationTODO:
- [x] Verify this works on dev server
- [ ] Figure out SSL somehow: http://www.postfix.org/TLS_README.html (Moved to #2453)TODO:
- [x] Verify this works on dev server
- [ ] Figure out SSL somehow: http://www.postfix.org/TLS_README.html (Moved to #2453)8.0Douwe MaanDouwe Maan