summaryrefslogtreecommitdiff
path: root/doc/workflow
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2017-02-15 11:29:19 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2017-02-15 11:29:19 +0000
commit88132258d66ca955b0e9bd93d4ee8dc12cc54537 (patch)
treea2ff860a029e6798644a6c23f8be8e6e40538145 /doc/workflow
parent511329a68c27a4ace057c316df4e60c7d9a90389 (diff)
parenta084437b5c1b7226ce64e74bab1972bb1dbd49e0 (diff)
downloadgitlab-ce-88132258d66ca955b0e9bd93d4ee8dc12cc54537.tar.gz
Merge branch 'docs/builds-to-jobs-massacre' into 'master'
Rename builds to jobs in docs See merge request !9204
Diffstat (limited to 'doc/workflow')
-rw-r--r--doc/workflow/shortcuts.md4
-rw-r--r--doc/workflow/todos.md4
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/workflow/shortcuts.md b/doc/workflow/shortcuts.md
index 36516883ef6..2a5e622dc7d 100644
--- a/doc/workflow/shortcuts.md
+++ b/doc/workflow/shortcuts.md
@@ -45,7 +45,7 @@ You can see GitLab's keyboard shortcuts by using 'shift + ?'
| <kbd>g</kbd> + <kbd>e</kbd> | Go to the project's activity feed |
| <kbd>g</kbd> + <kbd>f</kbd> | Go to files |
| <kbd>g</kbd> + <kbd>c</kbd> | Go to commits |
-| <kbd>g</kbd> + <kbd>b</kbd> | Go to builds |
+| <kbd>g</kbd> + <kbd>b</kbd> | Go to jobs |
| <kbd>g</kbd> + <kbd>n</kbd> | Go to network graph |
| <kbd>g</kbd> + <kbd>g</kbd> | Go to graphs |
| <kbd>g</kbd> + <kbd>i</kbd> | Go to issues |
@@ -73,4 +73,4 @@ You can see GitLab's keyboard shortcuts by using 'shift + ?'
| <kbd>m</kbd> | Change milestone |
| <kbd>r</kbd> | Reply (quoting selected text) |
| <kbd>e</kbd> | Edit issue/merge request |
-| <kbd>l</kbd> | Change label | \ No newline at end of file
+| <kbd>l</kbd> | Change label |
diff --git a/doc/workflow/todos.md b/doc/workflow/todos.md
index 1a8fc39bb33..99d7c18f072 100644
--- a/doc/workflow/todos.md
+++ b/doc/workflow/todos.md
@@ -27,8 +27,8 @@ A Todo appears in your Todos dashboard when:
- an issue or merge request is assigned to you,
- you are `@mentioned` in an issue or merge request, be it the description of
the issue/merge request or in a comment,
-- build in the CI pipeline running for your merge request failed, but this
- build is not allowed to fail.
+- a job in the CI pipeline running for your merge request failed, but this
+ job is not allowed to fail.
>**Note:** Commenting on a commit will _not_ trigger a Todo.