diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 03:09:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 03:09:30 +0300 |
| commit | 060c842402c00f830a810702600cbe39dfa6cf62 (patch) | |
| tree | 743bd65ac0c1d4d6518ae8cdd4af5718ec7fb890 /doc | |
| parent | 6867eff1f997a881cd3ea64109f7ba2d4b42fde4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/graphql/reference/gitlab_schema.graphql | 5 | ||||
| -rw-r--r-- | doc/api/graphql/reference/gitlab_schema.json | 18 | ||||
| -rw-r--r-- | doc/ci/ssh_keys/README.md | 4 | ||||
| -rw-r--r-- | doc/user/application_security/sast/index.md | 3 |
4 files changed, 28 insertions, 2 deletions
diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql index 7fd6e78539e..2696c7355bc 100644 --- a/doc/api/graphql/reference/gitlab_schema.graphql +++ b/doc/api/graphql/reference/gitlab_schema.graphql @@ -5875,6 +5875,11 @@ type Project { Search query """ search: String + + """ + States of environments that should be included in result + """ + states: [String!] ): EnvironmentConnection """ diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json index a4210165c6d..66f4ce0940f 100644 --- a/doc/api/graphql/reference/gitlab_schema.json +++ b/doc/api/graphql/reference/gitlab_schema.json @@ -17786,6 +17786,24 @@ "defaultValue": null }, { + "name": "states", + "description": "States of environments that should be included in result", + "type": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "SCALAR", + "name": "String", + "ofType": null + } + } + }, + "defaultValue": null + }, + { "name": "after", "description": "Returns the elements in the list that come after the specified cursor.", "type": { diff --git a/doc/ci/ssh_keys/README.md b/doc/ci/ssh_keys/README.md index b3403cd246f..16e87e92a07 100644 --- a/doc/ci/ssh_keys/README.md +++ b/doc/ci/ssh_keys/README.md @@ -182,7 +182,7 @@ before_script: ## Assuming you created the SSH_KNOWN_HOSTS variable, uncomment the ## following two lines. ## - - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts + - echo "$SSH_KNOWN_HOSTS" >> ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts ## @@ -199,7 +199,7 @@ before_script: ## WARNING: Use this only with the Docker executor, if you use it with shell ## you will overwrite your user's SSH config. ## - #- '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' + #- '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" >> ~/.ssh/config' ``` ## Example project diff --git a/doc/user/application_security/sast/index.md b/doc/user/application_security/sast/index.md index c864abfe1ae..0930ee6610b 100644 --- a/doc/user/application_security/sast/index.md +++ b/doc/user/application_security/sast/index.md @@ -298,6 +298,9 @@ Some analyzers make it possible to filter out vulnerabilities under a given thre | `SAST_FLAWFINDER_LEVEL` | 1 | Ignore Flawfinder vulnerabilities under given risk level. Integer, 0=No risk, 5=High risk. | | `SAST_GITLEAKS_ENTROPY_LEVEL` | 8.0 | Minimum entropy for secret detection. Float, 0.0 = low, 8.0 = high. | | `SAST_GOSEC_LEVEL` | 0 | Ignore gosec vulnerabilities under given confidence level. Integer, 0=Undefined, 1=Low, 2=Medium, 3=High. | +| `SAST_GITLEAKS_COMMIT_FROM` | - | The commit a gitleaks scan starts at. | +| `SAST_GITLEAKS_COMMIT_TO` | - | The commit a gitleaks scan ends at. | +| `SAST_GITLEAKS_HISTORIC_SCAN` | false | Flag to enable a historic gitleaks scan. | #### Timeouts |