Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
GitLab Bot
parent
b133cb2468
commit
500626a5c9
37 changed files with 58 additions and 68 deletions
|
|
@ -38,12 +38,3 @@ BasedOnStyles = gitlab
|
|||
# To change the reporting level (suggestion, warning, error) of a rule,
|
||||
# use the following format: {style}.{filename} = {level}
|
||||
# vale.Hedging = error
|
||||
|
||||
# Syntax-specific settings
|
||||
# ------------------------
|
||||
# You can configure specific tests to be enabled, disabled, or report at a
|
||||
# different level for specific file types. File-type-specific settings added
|
||||
# here will overwrite any conflicting global settings.
|
||||
[*.{md,txt}]
|
||||
# vale.Editorializing = NO
|
||||
|
||||
|
|
|
|||
|
|
@ -1523,7 +1523,7 @@ globally and all jobs will use that definition.
|
|||
Use the `paths` directive to choose which files or directories will be cached. Paths
|
||||
are relative to the project directory (`$CI_PROJECT_DIR`) and cannot directly link outside it.
|
||||
Wildcards can be used that follow the [glob](https://en.wikipedia.org/wiki/Glob_(programming))
|
||||
patterns and [filepath.Match](https://golang.org/pkg/path/filepath/#Match).
|
||||
patterns and [`filepath.Match`](https://golang.org/pkg/path/filepath/#Match).
|
||||
|
||||
Cache all files in `binaries` that end in `.apk` and the `.config` file:
|
||||
|
||||
|
|
@ -1755,7 +1755,7 @@ be available for download in the GitLab UI.
|
|||
|
||||
Paths are relative to the project directory (`$CI_PROJECT_DIR`) and cannot directly
|
||||
link outside it. Wildcards can be used that follow the [glob](https://en.wikipedia.org/wiki/Glob_(programming))
|
||||
patterns and [filepath.Match](https://golang.org/pkg/path/filepath/#Match).
|
||||
patterns and [`filepath.Match`](https://golang.org/pkg/path/filepath/#Match).
|
||||
|
||||
To restrict which jobs a specific job will fetch artifacts from, see [dependencies](#dependencies).
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ of possible security breaches in our code:
|
|||
- SQL injections
|
||||
|
||||
Remember to run
|
||||
[SAST](../../user/application_security/sast/index.md)
|
||||
[SAST](../../user/application_security/sast/index.md) and [Dependency Scanning](../../user/application_security/dependency_scanning/index.md)
|
||||
**(ULTIMATE)** on your project (or at least the [gosec
|
||||
analyzer](https://gitlab.com/gitlab-org/security-products/analyzers/gosec)),
|
||||
and to follow our [Security
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ The following languages and dependency managers are supported.
|
|||
| Python ([poetry](https://poetry.eustace.io/)) | not currently ([issue](https://gitlab.com/gitlab-org/gitlab/issues/7006 "Support Poetry in Dependency Scanning")) | not available |
|
||||
| Ruby ([gem](https://rubygems.org/)) | yes | [gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium), [bundler-audit](https://github.com/rubysec/bundler-audit) |
|
||||
| Scala ([sbt](https://www.scala-sbt.org/)) | yes | [gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium) |
|
||||
| Go ([Golang](https://golang.org/)) | yes ([alpha](https://gitlab.com/gitlab-org/gitlab/issues/7132)) | [gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium) |
|
||||
| Go ([Go Modules](https://github.com/golang/go/wiki/Modules)) | yes ([alpha](https://gitlab.com/gitlab-org/gitlab/issues/7132)) | [gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium) |
|
||||
|
||||
## Configuration
|
||||
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ Some vulnerabilities can be fixed by applying the solution that GitLab
|
|||
automatically generates. The following scanners are supported:
|
||||
|
||||
- [Dependency Scanning](dependency_scanning/index.md):
|
||||
Automatic Patch creation is only available for Node.JS projects managed with
|
||||
Automatic Patch creation is only available for Node.js projects managed with
|
||||
`yarn`.
|
||||
|
||||
#### Manually applying the suggested patch
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ Read more on how to [interact with the vulnerabilities](../index.md#interacting-
|
|||
|
||||
## Instance Security Dashboard
|
||||
|
||||
> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/6953) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 12.7.
|
||||
> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/6953) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 12.8.
|
||||
|
||||
At the instance level, the Security Dashboard displays the vulnerabilities
|
||||
present in all of the projects that you have added to it.
|
||||
|
|
|
|||
|
|
@ -218,8 +218,11 @@ You can follow our work towards this goal in the
|
|||
|
||||
The full contents of our `config.toml` are:
|
||||
|
||||
NOTE: **Note:**
|
||||
Settings that are not public are shown as `X`.
|
||||
|
||||
```toml
|
||||
concurrent = 10
|
||||
concurrent = X
|
||||
check_interval = 3
|
||||
|
||||
[[runners]]
|
||||
|
|
@ -291,8 +294,8 @@ stages:
|
|||
- test
|
||||
|
||||
before_script:
|
||||
- date +"%H"
|
||||
- echo ${HOUR}
|
||||
- Set-Variable -Name "time" -Value (date -Format "%H:%m")
|
||||
- echo ${time}
|
||||
- echo "started by ${GITLAB_USER_NAME}"
|
||||
|
||||
build:
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ the [next section](#authenticating-to-the-gitlab-npm-registry).
|
|||
|
||||
### Installing NPM
|
||||
|
||||
Follow the instructions at [npmjs.com](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm) to download and install Node.JS and
|
||||
Follow the instructions at [npmjs.com](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm) to download and install Node.js and
|
||||
NPM to your local development environment.
|
||||
|
||||
Once installation is complete, verify you can use NPM in your terminal by
|
||||
|
|
|
|||
|
|
@ -4,13 +4,9 @@ type: reference, concepts
|
|||
|
||||
# Merge Request dependencies **(PREMIUM)**
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/9688) in
|
||||
[GitLab Premium](https://about.gitlab.com/pricing/) 12.2.
|
||||
> - [Renamed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17291) from
|
||||
"Cross-project dependencies" to "Merge Requests dependencies" in
|
||||
[GitLab Premium](https://about.gitlab.com/pricing/) 12.4.
|
||||
> - Intra-project MR dependencies were [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16799)
|
||||
in [GitLab Premium](https://about.gitlab.com/pricing/) 12.4.
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/9688) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.2.
|
||||
> - [Renamed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17291) from "Cross-project dependencies" to "Merge Requests dependencies" in [GitLab Premium](https://about.gitlab.com/pricing/) 12.4.
|
||||
> - Intra-project MR dependencies were [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16799) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.4.
|
||||
|
||||
Merge request dependencies allows a required order of merging
|
||||
between merge requests to be expressed. If a merge request "depends on" another,
|
||||
|
|
@ -129,7 +125,7 @@ graph LR;
|
|||
herfriend/another-lib!1-->mycorp/awesome-project!100;
|
||||
```
|
||||
|
||||
What is **not** supported is a "deep", or "nested" graph of dependencies, e.g.:
|
||||
What is **not** supported is a "deep", or "nested" graph of dependencies. For example:
|
||||
|
||||
```mermaid
|
||||
graph LR;
|
||||
|
|
|
|||
Loading…
Reference in a new issue