diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 00:09:16 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 00:09:16 +0300 |
commit | 154b9bae142ba15fec753f44327654595094b879 (patch) | |
tree | 027f8ae024961778d5b00c77a72fe302f985d4f3 /doc | |
parent | 2c156e3c7bbade01c36eee18327f1ced6eebea79 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
14 files changed, 20 insertions, 7 deletions
diff --git a/doc/development/background_migrations.md b/doc/development/background_migrations.md index 9dbfde98766..c28008c94b8 100644 --- a/doc/development/background_migrations.md +++ b/doc/development/background_migrations.md @@ -301,12 +301,13 @@ It is required to write tests for: - The background migration itself. - A cleanup migration. -You can use the `:migration` RSpec tag when testing the migrations. +The `:migration` and `schema: :latest` RSpec tags are automatically set for +background migration specs. See the [Testing Rails migrations](testing_guide/testing_migrations_guide.md#testing-a-non-activerecordmigration-class) style guide. -When you do that, keep in mind that `before` and `after` RSpec hooks are going +Keep in mind that `before` and `after` RSpec hooks are going to migrate you database down and up, which can result in other background migrations being called. That means that using `spy` test doubles with `have_received` is encouraged, instead of using regular test doubles, because diff --git a/doc/development/testing_guide/testing_migrations_guide.md b/doc/development/testing_guide/testing_migrations_guide.md index 05773f07b0f..a03b940fe40 100644 --- a/doc/development/testing_guide/testing_migrations_guide.md +++ b/doc/development/testing_guide/testing_migrations_guide.md @@ -158,7 +158,9 @@ end To test a non-`ActiveRecord::Migration` test (a background migration), you will need to manually provide a required schema version. Please add a -schema tag to a context that you want to switch the database schema within. +`schema` tag to a context that you want to switch the database schema within. + +If not set, `schema` defaults to `:latest`. Example: diff --git a/doc/topics/airgap/index.md b/doc/topics/airgap/index.md new file mode 100644 index 00000000000..abeb3a4b1d3 --- /dev/null +++ b/doc/topics/airgap/index.md @@ -0,0 +1,10 @@ +# Air-gapped GitLab + +Computers in an air-gapped network are isolated from the public internet as a security measure. +This page lists all the information available for running GitLab in an air-gapped environment. + +## Features + +Follow these best practices to use GitLab's features in an offline environment: + +- [Operating the GitLab Secure scanners in an offline environment](../../user/application_security/offline_deployments/index.md). diff --git a/doc/user/application_security/container_scanning/img/container_scanning.png b/doc/user/application_security/container_scanning/img/container_scanning.png Binary files differdeleted file mode 100644 index e47f62acd9d..00000000000 --- a/doc/user/application_security/container_scanning/img/container_scanning.png +++ /dev/null diff --git a/doc/user/application_security/container_scanning/img/container_scanning_v12_9.png b/doc/user/application_security/container_scanning/img/container_scanning_v12_9.png Binary files differnew file mode 100644 index 00000000000..dd96fc7aacb --- /dev/null +++ b/doc/user/application_security/container_scanning/img/container_scanning_v12_9.png diff --git a/doc/user/application_security/container_scanning/index.md b/doc/user/application_security/container_scanning/index.md index 1d4a2187dc6..075536ce9ad 100644 --- a/doc/user/application_security/container_scanning/index.md +++ b/doc/user/application_security/container_scanning/index.md @@ -23,7 +23,7 @@ GitLab checks the Container Scanning report, compares the found vulnerabilities between the source and target branches, and shows the information right on the merge request. -![Container Scanning Widget](img/container_scanning.png) +![Container Scanning Widget](img/container_scanning_v12_9.png) ## Use cases diff --git a/doc/user/application_security/dast/img/dast_all.png b/doc/user/application_security/dast/img/dast_all.png Binary files differdeleted file mode 100644 index b6edc928dc3..00000000000 --- a/doc/user/application_security/dast/img/dast_all.png +++ /dev/null diff --git a/doc/user/application_security/dast/img/dast_all_v12_9.png b/doc/user/application_security/dast/img/dast_all_v12_9.png Binary files differnew file mode 100644 index 00000000000..9871d1e6a43 --- /dev/null +++ b/doc/user/application_security/dast/img/dast_all_v12_9.png diff --git a/doc/user/application_security/dast/img/dast_single.png b/doc/user/application_security/dast/img/dast_single.png Binary files differdeleted file mode 100644 index 26ca4bde786..00000000000 --- a/doc/user/application_security/dast/img/dast_single.png +++ /dev/null diff --git a/doc/user/application_security/dast/img/dast_single_v12_9.png b/doc/user/application_security/dast/img/dast_single_v12_9.png Binary files differnew file mode 100644 index 00000000000..a8a4b1c1d4f --- /dev/null +++ b/doc/user/application_security/dast/img/dast_single_v12_9.png diff --git a/doc/user/application_security/dast/index.md b/doc/user/application_security/dast/index.md index dd87449a1b2..c82ba04b697 100644 --- a/doc/user/application_security/dast/index.md +++ b/doc/user/application_security/dast/index.md @@ -35,12 +35,12 @@ NOTE: **Note:** This comparison logic uses only the latest pipeline executed for the target branch's base commit. Running the pipeline on any other commit has no effect on the merge request. -![DAST Widget](img/dast_all.png) +![DAST Widget](img/dast_all_v12_9.png) By clicking on one of the detected linked vulnerabilities, you will be able to see the details and the URL(s) affected. -![DAST Widget Clicked](img/dast_single.png) +![DAST Widget Clicked](img/dast_single_v12_9.png) [Dynamic Application Security Testing (DAST)](https://en.wikipedia.org/wiki/Dynamic_Application_Security_Testing) is using the popular open source tool [OWASP ZAProxy](https://github.com/zaproxy/zaproxy) diff --git a/doc/user/application_security/sast/img/sast.png b/doc/user/application_security/sast/img/sast.png Binary files differdeleted file mode 100644 index 2c75592c32a..00000000000 --- a/doc/user/application_security/sast/img/sast.png +++ /dev/null diff --git a/doc/user/application_security/sast/img/sast_v12_9.png b/doc/user/application_security/sast/img/sast_v12_9.png Binary files differnew file mode 100644 index 00000000000..91f4b8a8e2e --- /dev/null +++ b/doc/user/application_security/sast/img/sast_v12_9.png diff --git a/doc/user/application_security/sast/index.md b/doc/user/application_security/sast/index.md index 42889a86e4c..70d31f8e1d6 100644 --- a/doc/user/application_security/sast/index.md +++ b/doc/user/application_security/sast/index.md @@ -25,7 +25,7 @@ that is provided by [Auto DevOps](../../../topics/autodevops/index.md). GitLab checks the SAST report, compares the found vulnerabilities between the source and target branches, and shows the information right on the merge request. -![SAST Widget](img/sast.png) +![SAST Widget](img/sast_v12_9.png) The results are sorted by the priority of the vulnerability: |