Commit 3e0fb114 authored by Marcel Amirault's avatar Marcel Amirault

Merge branch 'eread/add-more-oxford-commas' into 'master'

Add more Oxford commas where neccessary

See merge request gitlab-org/gitlab!26546
parents 3d9aa2fd f5276e7a
......@@ -47,7 +47,7 @@ instance, including the sign in / sign up page. The default color is white text
an orange background, but this can be customized by clicking on **Customize colors**.
Limited [Markdown](../markdown.md) is supported, such as bold, italics, and links, for
example. Other Markdown features, including lists, images and quotes, are not supported,
example. Other Markdown features, including lists, images, and quotes are not supported
as the header and footer messages can only be a single line.
![header and footer screenshot](img/appearance_header_footer_v12_3.png)
......
......@@ -4,7 +4,7 @@ type: reference
# Continuous Integration and Deployment Admin settings **(CORE ONLY)**
In this area, you will find settings for Auto DevOps, Runners and job artifacts.
In this area, you will find settings for Auto DevOps, Runners, and job artifacts.
You can find it in the **Admin Area > Settings > CI/CD**.
![Admin Area settings button](../img/admin_area_settings_button.png)
......
......@@ -8,7 +8,7 @@ For many companies, the development cycle is a blackbox and getting an estimate
long, on average, it takes to deliver features is an enormous endeavor.
While [Value Stream Analytics](../project/cycle_analytics.md) focuses on the entire
Software Development Life Cycle (SDLC) process, Productivity Analytics provides a way for Engineering Management to drill down in a systematic way to uncover patterns and causes for success or failure at an individual, project or group level.
Software Development Life Cycle (SDLC) process, Productivity Analytics provides a way for Engineering Management to drill down in a systematic way to uncover patterns and causes for success or failure at an individual, project, or group level.
Productivity can slow down for many reasons ranging from degrading code base to quickly growing teams. In order to investigate, department or team leaders can start by visualizing the time it takes for merge requests to be merged.
......@@ -18,7 +18,7 @@ Productivity Analytics allows GitLab users to:
- Visualize typical merge request (MR) lifetime and statistics. Use a histogram that shows the distribution of the time elapsed between creating and merging merge requests.
- Drill down into the most time consuming merge requests, select a number of outliers, and filter down all subsequent charts to investigate potential causes.
- Filter by group, project, author, label, milestone, or a specific date range. Filter down, for example, to the merge requests of a specific author in a group or project during a milestone or specific date range.
- Filter by group, project, author, label, milestone, or a specific date range. For example, filter down to the merge requests of a specific author in a group or project during a milestone or specific date range.
- Measure velocity over time. Visualize the trends of each metric from the charts above over time in order to observe progress. Zoom in on a particular date range if you notice outliers.
## Accessing metrics and visualizations
......
......@@ -26,7 +26,7 @@ The Security Dashboard supports the following reports:
## Requirements
To use the instance, group, project or pipeline security dashboard:
To use the instance, group, project, or pipeline security dashboard:
1. At least one project inside a group must be configured with at least one of
the [supported reports](#supported-reports).
......
......@@ -156,10 +156,12 @@ These are dynamic dates which are recalculated if any of the following occur:
> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/7332) in GitLab 12.5 to replace **From milestones**.
If you select **Inherited** for the start date, GitLab will scan all child epics and issues assigned to the epic,
and will set the start date to match the earliest found start date or milestone. Similarly, if you select
**Inherited** for the due date, GitLab will set the due date to match the latest due date or milestone
found among its child epics and issues.
If you select:
- **Inherited** for the start date, GitLab will scan all child epics and issues assigned to the epic,
and will set the start date to match the earliest found start date or milestone.
- **Inherited** for the due date, GitLab will set the due date to match the latest due date or
milestone found among its child epics and issues.
These are dynamic dates and recalculated if any of the following occur:
......
......@@ -347,7 +347,7 @@ Changing a group's path can have unintended side effects. Read
before proceeding.
If you are vacating the path so it can be claimed by another group or user,
you may need to rename the group, too, since both names and paths must
you may need to rename the group too, since both names and paths must
be unique.
To change your group path:
......
......@@ -266,7 +266,7 @@ For example, to unlink the `MyOrg` account, the following **Disconnect** button
| Term | Description |
|------|-------------|
| Identity Provider | The service which manages your user identities such as ADFS, Okta, Onelogin or Ping Identity. |
| Identity Provider | The service which manages your user identities such as ADFS, Okta, Onelogin, or Ping Identity. |
| Service Provider | SAML considers GitLab to be a service provider. |
| Assertion | A piece of information about a user's identity, such as their name or role. Also know as claims or attributes. |
| SSO | Single Sign On. |
......
......@@ -25,5 +25,5 @@ How do we measure the activity of users? GitLab considers a user active if:
- The user signs in.
- The user has Git activity (whether push or pull).
- The user visits pages related to Dashboards, Projects, Issues and Merge Requests ([introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/54947) in GitLab 11.8).
- The user visits pages related to Dashboards, Projects, Issues, and Merge Requests ([introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/54947) in GitLab 11.8).
- The user uses the API
......@@ -198,7 +198,7 @@ Add the Conan recipe to the `[requires]` section of the file:
cmake
```
Next, from the root of your project, create a build directory and navigate to it:
Next, create a build directory from the root of your project and navigate to it:
```shell
mkdir build && cd build
......
......@@ -9,7 +9,11 @@ particular group or project. If a user is both in a project's group and the
project itself, the highest permission level is used.
On public and internal projects the Guest role is not enforced. All users will
be able to create issues, leave comments, and clone or download the project code.
be able to:
- Create issues.
- Leave comments.
- Clone or download the project code.
When a member leaves a team's project, all the assigned [Issues](project/issues/index.md) and [Merge Requests](project/merge_requests/index.md)
will be unassigned automatically.
......@@ -267,7 +271,7 @@ External users:
logged out).
Access can be granted by adding the user as member to the project or group.
They will, like usual users, receive a role in the project or group with all
Like usual users, they will receive a role in the project or group with all
the abilities that are mentioned in the [permissions table above](#project-members-permissions).
For example, if an external user is added as Guest, and your project is
private, they will not have access to the code; you would need to grant the external
......
......@@ -39,7 +39,7 @@ Import your projects from Bitbucket Server to GitLab with minimal effort.
The Bitbucket Server importer works as follows:
1. The user will be prompted to enter the URl, username, and password or personal access token to login to Bitbucket.
1. The user will be prompted to enter the URL, username, and password (or personal access token) to log in to Bitbucket.
These credentials are preserved only as long as the importer is running.
1. The importer will attempt to list all the current repositories on the Bitbucket Server.
1. Upon selection, the importer will clone the repository and import pull requests and comments.
......
......@@ -200,8 +200,12 @@ to let them know your reaction without spamming them.
#### 21. Show all activity
You can filter what is displayed in the issue history by clicking on **Show all activity**
and selecting either **Show comments only**, which only shows threads and hides
updates to the issue, or **Show history only**, which hides threads and only shows updates.
and selecting either:
- **Show comments only**, which only shows threads and hides updates to the issue.
- **Show history only**, which hides threads and only shows updates.
Also:
- You can mention a user or a group present in your GitLab instance with
`@username` or `@groupname` and they will be notified via To-Do items
......
......@@ -210,7 +210,7 @@ means higher priority.
![Drag to change label priority](img/labels_drag_priority_v12_1.gif)
On the epic, merge request, and issue list pages, for both groups and projects, you
On the epic, merge request, and issue list pages (for both groups and projects) you
can sort by `Label priority` or `Priority`.
If you sort by `Label priority`, GitLab uses this sort comparison order:
......
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