diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-11 15:09:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-11 15:09:17 +0300 |
commit | fd31bd1fc7954f69025d8e6bbe7f772ea9fb4bb0 (patch) | |
tree | cd6cc3ac0ec8123e41cb1edc81448f3a5140a14c /doc/development | |
parent | 988375009f3393c7db4944b707b9989d6e9b794e (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/geo.md | 4 | ||||
-rw-r--r-- | doc/development/packages/dependency_proxy.md | 2 | ||||
-rw-r--r-- | doc/development/performance.md | 2 | ||||
-rw-r--r-- | doc/development/testing_guide/end_to_end/beginners_guide.md | 2 | ||||
-rw-r--r-- | doc/development/testing_guide/end_to_end/best_practices.md | 2 | ||||
-rw-r--r-- | doc/development/testing_guide/review_apps.md | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/doc/development/fips_compliance.md b/doc/development/fips_compliance.md index 6cd88b49d7c..475c1a49000 100644 --- a/doc/development/fips_compliance.md +++ b/doc/development/fips_compliance.md @@ -417,7 +417,7 @@ In this environment, OpenSSL refuses to perform cryptographic operations forbidden by the FIPS standards. This enables you to reproduce FIPS-related bugs, and validate fixes. -You should be able to open a web browser inside the virtual machine and log in +You should be able to open a web browser inside the virtual machine and sign in to the GitLab instance. You can disable FIPS mode again by running this command, then restarting the diff --git a/doc/development/geo.md b/doc/development/geo.md index d1838410811..884c09cc174 100644 --- a/doc/development/geo.md +++ b/doc/development/geo.md @@ -69,8 +69,8 @@ the lock, it switches to standby mode. Geo uses [streaming replication](#streaming-replication) to replicate the database from the **primary** to the **secondary** sites. This replication gives the **secondary** sites access to all the data saved -in the database. So users can log in on the **secondary** and read all -the issues, merge requests, and so on, on the **secondary** site. +in the database, so users can sign in to the **secondary** site and read, +for example, all the issues and merge requests. ### Repository replication diff --git a/doc/development/packages/dependency_proxy.md b/doc/development/packages/dependency_proxy.md index 92e73039a84..f3e323fb9fa 100644 --- a/doc/development/packages/dependency_proxy.md +++ b/doc/development/packages/dependency_proxy.md @@ -75,7 +75,7 @@ application from the registry. For example, the GitLab container registry direct from `https://gitlab.com/jwt/auth`. This endpoint is part of the `gitlab-org/gitlab` project, also known as the rails project or web service. -When a user tries to log into the dependency proxy with a Docker client, we must tell it where to get a JWT. We +When a user tries to sign in to the dependency proxy with a Docker client, we must tell it where to get a JWT. We can use the same endpoint we use with the container registry: `https://gitlab.com/jwt/auth`. But in our case, we tell the Docker client to specify `service=dependency_proxy` in the parameters so can use a separate underlying service to generate the token. diff --git a/doc/development/performance.md b/doc/development/performance.md index f07e64fa583..f2417a49b27 100644 --- a/doc/development/performance.md +++ b/doc/development/performance.md @@ -79,7 +79,7 @@ GitLab provides built-in tools to help improve performance and availability: - [Service measurement](service_measurement.md) for measuring and logging service execution. GitLab team members can use [GitLab.com's performance monitoring systems](https://about.gitlab.com/handbook/engineering/monitoring/) located at -[`dashboards.gitlab.net`](https://dashboards.gitlab.net), this requires you to log in using your +[`dashboards.gitlab.net`](https://dashboards.gitlab.net), this requires you to sign in using your `@gitlab.com` email address. Non-GitLab team-members are advised to set up their own Prometheus and Grafana stack. diff --git a/doc/development/testing_guide/end_to_end/beginners_guide.md b/doc/development/testing_guide/end_to_end/beginners_guide.md index 7c87845e34f..bceb0d12fde 100644 --- a/doc/development/testing_guide/end_to_end/beginners_guide.md +++ b/doc/development/testing_guide/end_to_end/beginners_guide.md @@ -246,7 +246,7 @@ end ``` The `before` block is essentially a `before(:each)` and is run before each example, -ensuring we now log in at the beginning of each test. +ensuring we now sign in at the beginning of each test. ## Test setup using resources and page objects diff --git a/doc/development/testing_guide/end_to_end/best_practices.md b/doc/development/testing_guide/end_to_end/best_practices.md index 618c0360595..82d2eee0142 100644 --- a/doc/development/testing_guide/end_to_end/best_practices.md +++ b/doc/development/testing_guide/end_to_end/best_practices.md @@ -299,7 +299,7 @@ point of failure and so the screenshot would not be captured at the right moment ## Ensure tests do not leave the browser logged in -All tests expect to be able to log in at the start of the test. +All tests expect to be able to sign in at the start of the test. For an example see [issue #34736](https://gitlab.com/gitlab-org/gitlab/-/issues/34736). diff --git a/doc/development/testing_guide/review_apps.md b/doc/development/testing_guide/review_apps.md index f7c1823c418..973ec0555f6 100644 --- a/doc/development/testing_guide/review_apps.md +++ b/doc/development/testing_guide/review_apps.md @@ -84,7 +84,7 @@ the GitLab handbook information for the [shared 1Password account](https://about ### Enable a feature flag for my Review App -1. Open your Review App and log in as documented above. +1. Open your Review App and sign in as documented above. 1. Create a personal access token. 1. Enable the feature flag using the [Feature flag API](../../api/features.md). |