diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 06:09:08 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 06:09:08 +0300 |
commit | e83144f0eef1a161b69d2b991841674978014283 (patch) | |
tree | 58c2ab892ca053655d25e68f8416dfce104bb62a /doc/development | |
parent | 69b1c09769fbb48258f5de06fd3b4955b0758c1f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development')
-rw-r--r-- | doc/development/fips_compliance.md | 2 | ||||
-rw-r--r-- | doc/development/service_ping/index.md | 2 | ||||
-rw-r--r-- | doc/development/testing_guide/contract/consumer_tests.md | 2 | ||||
-rw-r--r-- | doc/development/testing_guide/frontend_testing.md | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/doc/development/fips_compliance.md b/doc/development/fips_compliance.md index 475c1a49000..c976f057d02 100644 --- a/doc/development/fips_compliance.md +++ b/doc/development/fips_compliance.md @@ -67,7 +67,7 @@ listed here that also do not work properly in FIPS mode: - [Static Application Security Testing (SAST)](../user/application_security/sast/index.md) supports a reduced set of [analyzers](../user/application_security/sast/index.md#fips-enabled-images) when operating in FIPS-compliant mode. -- Advanced Search is currently not included in FIPS mode. It must not be enabled to be FIPS-compliant. +- Advanced Search is currently not included in FIPS mode. It must not be enabled to be FIPS-compliant. - [Gravatar or Libravatar-based profile images](../administration/libravatar.md) are not FIPS-compliant. Additionally, these package repositories are disabled in FIPS mode: diff --git a/doc/development/service_ping/index.md b/doc/development/service_ping/index.md index 0a4e5998345..5baf1a6d38d 100644 --- a/doc/development/service_ping/index.md +++ b/doc/development/service_ping/index.md @@ -115,7 +115,7 @@ sequenceDiagram > - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/295289) in GitLab 15.2. [Feature flag `measure_service_ping_metric_collection`](https://gitlab.com/gitlab-org/gitlab/-/issues/358128) removed. ```ruby - { + { "metadata"=> { "uuid"=>"0000000-0000-0000-0000-000000000000", diff --git a/doc/development/testing_guide/contract/consumer_tests.md b/doc/development/testing_guide/contract/consumer_tests.md index 67bb7160749..9c72e6835bd 100644 --- a/doc/development/testing_guide/contract/consumer_tests.md +++ b/doc/development/testing_guide/contract/consumer_tests.md @@ -213,7 +213,7 @@ pactWith( const discussions = await getDiscussions({ url: provider.mockService.baseUrl, }); - + expect(discussions).toEqual(Matchers.eachLike({ id: 'fd73763cbcbf7b29eb8765d969a38f7d735e222a', project_id: 6954442, diff --git a/doc/development/testing_guide/frontend_testing.md b/doc/development/testing_guide/frontend_testing.md index d7627e2064f..256675e23b7 100644 --- a/doc/development/testing_guide/frontend_testing.md +++ b/doc/development/testing_guide/frontend_testing.md @@ -458,7 +458,7 @@ If you cannot register handlers to the `Promise`, for example because it is exec ```javascript it('waits for an Ajax call', async () => { synchronousFunction(); - + await waitForPromises(); expect(something).toBe('done'); |