Commit e297c417 authored by Jan Provaznik's avatar Jan Provaznik

Fixed doc for create MR from email

* fixed anchor for create MR from email
* added a screenshot for this feature
parent d673628d
...@@ -89,9 +89,11 @@ email address in order to sign up. ...@@ -89,9 +89,11 @@ email address in order to sign up.
If you also host a public-facing GitLab instance at `hooli.com` and set your If you also host a public-facing GitLab instance at `hooli.com` and set your
incoming email domain to `hooli.com`, an attacker could abuse the "Create new incoming email domain to `hooli.com`, an attacker could abuse the "Create new
issue by email" feature by using a project's unique address as the email when issue by email" or
signing up for Slack, which would send a confirmation email, which would create "[Create new merge request by email](../user/project/merge_requests/index.md#create-new-merge-requests-by-email)"
a new issue on the project owned by the attacker, allowing them to click the features by using a project's unique address as the email when signing up for
Slack, which would send a confirmation email, which would create a new issue or
merge request on the project owned by the attacker, allowing them to click the
confirmation link and validate their account on your company's private Slack confirmation link and validate their account on your company's private Slack
instance. instance.
......
...@@ -27,7 +27,7 @@ With GitLab merge requests, you can: ...@@ -27,7 +27,7 @@ With GitLab merge requests, you can:
- [Resolve merge conflicts from the UI](#resolve-conflicts) - [Resolve merge conflicts from the UI](#resolve-conflicts)
- Enable [fast-forward merge requests](#fast-forward-merge-requests) - Enable [fast-forward merge requests](#fast-forward-merge-requests)
- Enable [semi-linear history merge requests](#semi-linear-history-merge-requests) as another security layer to guarantee the pipeline is passing in the target branch - Enable [semi-linear history merge requests](#semi-linear-history-merge-requests) as another security layer to guarantee the pipeline is passing in the target branch
- [Create new merge requests by email](#create_by_email) - [Create new merge requests by email](#create-new-merge-requests-by-email)
With **[GitLab Enterprise Edition][ee]**, you can also: With **[GitLab Enterprise Edition][ee]**, you can also:
...@@ -139,7 +139,12 @@ address. The address can be obtained on the merge requests page by clicking on ...@@ -139,7 +139,12 @@ address. The address can be obtained on the merge requests page by clicking on
a **Email a new merge request to this project** button. The subject will be a **Email a new merge request to this project** button. The subject will be
used as the source branch name for the new merge request and the target branch used as the source branch name for the new merge request and the target branch
will be the default branch for the project. The message body (if not empty) will be the default branch for the project. The message body (if not empty)
will be used as the merge request description. will be used as the merge request description. You need
["Reply by email"](../../../administration/reply_by_email.md) enabled to use
this feature. If it's not enabled to your instance, you may ask your GitLab
administrator to do so.
![Create new merge requests by email](img/create_from_email.png)
## Revert changes ## Revert changes
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment