Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
0b940939
Commit
0b940939
authored
Aug 18, 2021
by
Diana Logan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'msj-at-mentions' into 'master'
Add at-mention to word list See merge request gitlab-org/gitlab!68145
parents
bdf91edb
124755c7
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
14 deletions
+20
-14
doc/development/cicd/templates.md
doc/development/cicd/templates.md
+2
-2
doc/development/contributing/index.md
doc/development/contributing/index.md
+6
-6
doc/development/documentation/styleguide/word_list.md
doc/development/documentation/styleguide/word_list.md
+6
-0
doc/user/profile/notifications.md
doc/user/profile/notifications.md
+2
-2
doc/user/project/issues/issue_data_and_actions.md
doc/user/project/issues/issue_data_and_actions.md
+1
-1
doc/user/todos.md
doc/user/todos.md
+3
-3
No files found.
doc/development/cicd/templates.md
View file @
0b940939
...
...
@@ -386,6 +386,6 @@ If you're unsure if it's secure or not, you need to ask security experts for cro
After your CI/CD template MR is created and labeled with
`ci::templates`
, DangerBot
suggests one reviewer and one maintainer that can review your code. When your merge
request is ready for review, please
`@mention`
the reviewer and ask them to review
your CI/CD template changes. See details in the merge request that added
request is ready for review, please
[
mention
](
../../user/project/issues/issue_data_and_actions.md#mentions
)
the reviewer and ask them to review
your CI/CD template changes. See details in the merge request that added
[
a DangerBot task for CI/CD template MRs
](
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44688
)
.
doc/development/contributing/index.md
View file @
0b940939
...
...
@@ -129,8 +129,8 @@ The general flow of contributing to GitLab is:
1.
In the merge request's description:
-
Ensure you provide complete and accurate information.
-
Review the provided checklist.
1.
Assign the merge request (if possible) to, or
`@mention`
, one of the
[
code owners
](
../../user/project/code_owners.md
)
for the relevant project,
1.
Assign the merge request (if possible) to, or
[
mention
](
../../user/project/issues/issue_data_and_actions.md#mentions
)
,
one of the
[
code owners
](
../../user/project/code_owners.md
)
for the relevant project,
and explain that you are ready for review.
When you submit code to GitLab, we really want it to get merged! However, we always review
...
...
@@ -167,18 +167,18 @@ GitLab will do its best to review community contributions as quickly as possible
appointed developers review community contributions daily. Look at the
[
team page
](
https://about.gitlab.com/company/team/
)
for the merge request coach who specializes in
the type of code you have written and mention them in the merge request. For example, if you have
written some front-end code, you should
`@mention`
the frontend merge request coach. If
your code has multiple disciplines, you may
`@mention`
multiple merge request coaches.
written some front-end code, you should
mention
the frontend merge request coach. If
your code has multiple disciplines, you may
mention
multiple merge request coaches.
GitLab receives a lot of community contributions. If your code has not been reviewed within two
working days of its initial submission, feel free to
`@mention`
all merge request coaches with
working days of its initial submission, feel free to
mention
all merge request coaches with
`@gitlab-org/coaches`
to get their attention.
When submitting code to GitLab, you may feel that your contribution requires the aid of an external
library. If your code includes an external library, please provide a link to the library, as well as
reasons for including it.
`@mention`
a maintainer in merge requests that contain:
Mention
a maintainer in merge requests that contain:
-
More than 500 changes.
-
Any major
[
breaking changes
](
#breaking-changes
)
.
...
...
doc/development/documentation/styleguide/word_list.md
View file @
0b940939
...
...
@@ -17,6 +17,12 @@ For guidance not on this page, we defer to these style guides:
<!-- vale off -->
<!-- markdownlint-disable -->
## @mention
Try to avoid. Say "mention" instead, and consider linking to the
[
mentions topic
](
../../../user/project/issues/issue_data_and_actions.md#mentions
)
.
Don't use
`code formatting`
.
## above
Try to avoid extra words when referring to an example or table in a documentation page, but if required, use
**previously**
instead.
...
...
doc/user/profile/notifications.md
View file @
0b940939
...
...
@@ -143,7 +143,7 @@ For each project and group you can select one of the following levels:
|:------------|:------------|
| Global | Your global settings apply. |
| Watch | Receive notifications for any activity. |
| On mention | Receive notifications when
`@mentioned`
in comments
. |
| On mention | Receive notifications when
[
mentioned
](
../project/issues/issue_data_and_actions.md#mentions
)
in a comment
. |
| Participate | Receive notifications for threads you have participated in. |
| Disabled | Turns off notifications. |
| Custom | Receive notifications for custom selected events. |
...
...
@@ -278,7 +278,7 @@ The participants are:
-
Authors of the design (can be multiple people if different authors have uploaded different versions of the design).
-
Authors of comments on the design.
-
Anyone that is
`@mentioned`
in a comment on the design.
-
Anyone that is
[
mentioned
](
../project/issues/issue_data_and_actions.md#mentions
)
in a comment on the design.
## Opt out of all GitLab emails
...
...
doc/user/project/issues/issue_data_and_actions.md
View file @
0b940939
...
...
@@ -199,7 +199,7 @@ You can mention a user or a group present in your GitLab instance with `@usernam
unless they have disabled all
[
notifications
](
#notifications
)
in their user settings.
This is controlled in the
[
notification settings
](
../../profile/notifications.md
)
.
Mentions for yourself (the
current logged in user
) are highlighted
Mentions for yourself (the
user currently signed in
) are highlighted
in a different color, which allows you to quickly see which comments involve you.
Avoid mentioning
`@all`
in issues and merge requests, as it sends an email notification
...
...
doc/user/todos.md
View file @
0b940939
...
...
@@ -31,9 +31,9 @@ Many to-do items are created automatically.
A to-do item is added to your To-Do List when:
-
An issue or merge request is assigned to you.
-
You're
`@mentioned`
in the description or comment of an issue, merge request,
or epic.
-
You are
`@mentioned`
in a comment on a commit or design.
-
You're
[
mentioned
](
project/issues/issue_data_and_actions.md#mentions
)
in the description or
comment of an issue, merge request,
or epic.
-
You are
mentioned
in a comment on a commit or design.
-
The CI/CD pipeline for your merge request fails.
-
An open merge request cannot be merged due to conflict, and one of the
following is true:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment