diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ci/examples/code_climate.md | 2 | ||||
| -rw-r--r-- | doc/development/contributing/issue_workflow.md | 4 | ||||
| -rw-r--r-- | doc/development/fe_guide/graphql.md | 6 | ||||
| -rw-r--r-- | doc/user/application_security/dast/index.md | 2 | ||||
| -rw-r--r-- | doc/user/application_security/dependency_scanning/index.md | 3 | ||||
| -rw-r--r-- | doc/user/application_security/license_management/index.md | 2 | ||||
| -rw-r--r-- | doc/user/application_security/sast/index.md | 2 |
7 files changed, 13 insertions, 8 deletions
diff --git a/doc/ci/examples/code_climate.md b/doc/ci/examples/code_climate.md index dc5a8ae119b..0aa108a2e73 100644 --- a/doc/ci/examples/code_climate.md +++ b/doc/ci/examples/code_climate.md @@ -1,5 +1,5 @@ --- -redirect_to: code_quality.md +redirect_to: 'code_quality.md' --- This document was moved to [another location](code_quality.md). diff --git a/doc/development/contributing/issue_workflow.md b/doc/development/contributing/issue_workflow.md index e3a1dc711fd..0396f7ebc45 100644 --- a/doc/development/contributing/issue_workflow.md +++ b/doc/development/contributing/issue_workflow.md @@ -163,9 +163,9 @@ or ~"Stretch". Any open issue for a previous milestone should be labeled Priority labels help us define the time a ~bug fix should be completed. Priority determines how quickly the defect turnaround time must be. If there are multiple defects, the priority decides which defect has to be fixed immediately versus later. -This label documents the planned timeline & urgency which is used to measure against our actual SLA on delivering ~bug fixes. +This label documents the planned timeline & urgency which is used to measure against our target SLO on delivering ~bug fixes. -| Label | Meaning | Defect SLA (applies only to ~bug and ~security defects) | +| Label | Meaning | Target SLO (applies only to ~bug and ~security defects) | |-------|-----------------|----------------------------------------------------------------------------| | ~P1 | Urgent Priority | The current release + potentially immediate hotfix to GitLab.com (30 days) | | ~P2 | High Priority | The next release (60 days) | diff --git a/doc/development/fe_guide/graphql.md b/doc/development/fe_guide/graphql.md index 8e06aa5d173..9fcd32fddfa 100644 --- a/doc/development/fe_guide/graphql.md +++ b/doc/development/fe_guide/graphql.md @@ -18,6 +18,12 @@ To save query compilation at runtime, webpack can directly import `.graphql` files. This allows webpack to preprocess the query at compile time instead of the client doing compilation of queries. +To distinguish queries from mutations and fragments, the following naming convention is recommended: + +- `allUsers.query.graphql` for queries; +- `addUser.mutation.graphql` for mutations; +- `basicUser.fragment.graphql` for fragments. + ## Usage in Vue To use Vue Apollo, import the [Vue Apollo][vue-apollo] plugin as well diff --git a/doc/user/application_security/dast/index.md b/doc/user/application_security/dast/index.md index 028ff72a160..a722aa88f9d 100644 --- a/doc/user/application_security/dast/index.md +++ b/doc/user/application_security/dast/index.md @@ -58,7 +58,7 @@ To enable DAST in your project, define a job in your `.gitlab-ci.yml` file that This can be done in two ways: -- For GitLab 11.9 and later, including the provided DAST `.gitlab-ci.yml` template (recommended). +- For GitLab 11.9 and later, including the provided `DAST.gitlab-ci.yml` template (recommended). - Manually specifying the job definition. Not recommended unless using GitLab 11.8 and earlier. diff --git a/doc/user/application_security/dependency_scanning/index.md b/doc/user/application_security/dependency_scanning/index.md index c65f369244a..f3bf743ad03 100644 --- a/doc/user/application_security/dependency_scanning/index.md +++ b/doc/user/application_security/dependency_scanning/index.md @@ -66,8 +66,7 @@ file that generates the This can be done in two ways: -- For GitLab 11.9 and later, including the provided Dependency Scanning - `.gitlab-ci.yml` template (recommended). +- For GitLab 11.9 and later, including the provided `Dependency-Scanning.gitlab-ci.yml` template (recommended). - Manually specifying the job definition. Not recommended unless using GitLab 11.8 and earlier. diff --git a/doc/user/application_security/license_management/index.md b/doc/user/application_security/license_management/index.md index 8b75995c377..7878dc77084 100644 --- a/doc/user/application_security/license_management/index.md +++ b/doc/user/application_security/license_management/index.md @@ -65,7 +65,7 @@ file that generates the [License Management report artifact](../../../ci/yaml/RE This can be done in two ways: -- For GitLab 11.9 and later, including the provided License Management `.gitlab-ci.yml` template (recommended). +- For GitLab 11.9 and later, including the provided `License-Management.gitlab-ci.yml` template (recommended). - Manually specifying the job definition. Not recommended unless using GitLab 11.8 and earlier. diff --git a/doc/user/application_security/sast/index.md b/doc/user/application_security/sast/index.md index 19befb04b76..11361f8ad89 100644 --- a/doc/user/application_security/sast/index.md +++ b/doc/user/application_security/sast/index.md @@ -80,7 +80,7 @@ To enable SAST in your project, define a job in your `.gitlab-ci.yml` file that This can be done in two ways: -- For GitLab 11.9 and later, including the provided SAST `.gitlab-ci.yml` template (recommended). +- For GitLab 11.9 and later, including the provided `SAST.gitlab-ci.yml` template (recommended). - Manually specifying the job definition. Not recommended unless using GitLab 11.8 and earlier. |