Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-09-14 12:52:09 +0300
committerDouwe Maan <douwe@gitlab.com>2018-09-14 12:52:09 +0300
commitfc0194b589238df6171ba3f4aeec79f8034b7128 (patch)
treecf61e7a7f0fa45b80de2a47f59d34bb60c1e4aab /doc
parent9de6efe6d18b0c6881aa5074d6e805ac6202d5e5 (diff)
Resolve "Add functionality to change what email address online actions commit using"
Diffstat (limited to 'doc')
-rw-r--r--doc/user/profile/index.md1
-rw-r--r--doc/user/project/repository/web_editor.md4
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/user/profile/index.md b/doc/user/profile/index.md
index 6b225147232..8604ea27f99 100644
--- a/doc/user/profile/index.md
+++ b/doc/user/profile/index.md
@@ -37,6 +37,7 @@ From there, you can:
[use GitLab as an OAuth provider](../../integration/oauth_provider.md#introduction-to-oauth)
- Manage [personal access tokens](personal_access_tokens.md) to access your account via API and authorized applications
- Add and delete emails linked to your account
+- Choose which email to use for notifications, web-based commits, and display on your public profile
- Manage [SSH keys](../../ssh/README.md#ssh) to access your account via SSH
- Manage your [preferences](preferences.md#syntax-highlighting-theme)
to customize your own GitLab experience
diff --git a/doc/user/project/repository/web_editor.md b/doc/user/project/repository/web_editor.md
index 33c9a1a4d6b..035028c9266 100644
--- a/doc/user/project/repository/web_editor.md
+++ b/doc/user/project/repository/web_editor.md
@@ -177,5 +177,9 @@ you commit the changes you will be taken to a new merge request form.
![Start a new merge request with these changes](img/web_editor_start_new_merge_request.png)
+If you'd prefer _not_ to use your primary email address for commits created
+through the web editor, you can choose to use another of your linked email
+addresses from the **User Settings > Edit Profile** page.
+
[ce-2808]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2808
[issue closing pattern]: ../issues/automatic_issue_closing.md