diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-29 15:08:23 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-29 15:08:23 +0300 |
| commit | d1d4dfb74a55a1b56b9451b2a844c57e05c9557f (patch) | |
| tree | 4481753bb0311b55d1ff4193809a5bed847357d3 /doc | |
| parent | 4011c903cf82eb37720b1b9526db595801cdff4f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/development/documentation/styleguide/word_list.md | 10 | ||||
| -rw-r--r-- | doc/development/testing_guide/best_practices.md | 8 | ||||
| -rw-r--r-- | doc/integration/saml.md | 5 |
3 files changed, 18 insertions, 5 deletions
diff --git a/doc/development/documentation/styleguide/word_list.md b/doc/development/documentation/styleguide/word_list.md index 1a012051960..333a5521536 100644 --- a/doc/development/documentation/styleguide/word_list.md +++ b/doc/development/documentation/styleguide/word_list.md @@ -1112,11 +1112,11 @@ To describe tiers: | Instead of | Use | |---------------------------------|----------------------------------------| -| In the Free tier or greater | In any tier | -| In the Free tier or higher | In any tier | -| In the Premium tier or greater | In the Premium or Ultimate tier | -| In the Premium tier or higher | In the Premium or Ultimate tier | -| In the Premium tier or lower | In the Free or Premium tier | +| In the Free tier or greater | In all tiers | +| In the Free tier or higher | In all tiers | +| In the Premium tier or greater | In the Premium and Ultimate tier | +| In the Premium tier or higher | In the Premium and Ultimate tier | +| In the Premium tier or lower | In the Free and Premium tier | ## that diff --git a/doc/development/testing_guide/best_practices.md b/doc/development/testing_guide/best_practices.md index 16394e31d15..9de85d076cb 100644 --- a/doc/development/testing_guide/best_practices.md +++ b/doc/development/testing_guide/best_practices.md @@ -447,6 +447,14 @@ Example: RSpec.describe Admin::Geo::SettingsController, :geo, feature_category: :geo_replication do ``` +For examples that don't have a `feature_category` set we add a warning when running them in local environment. + +In order to disable the warning use `RSPEC_WARN_MISSING_FEATURE_CATEGORY=false` when running RSpec tests: + +```shell +RSPEC_WARN_MISSING_FEATURE_CATEGORY=false bin/rspec spec/<test_file> +``` + ### Coverage [`simplecov`](https://github.com/colszowka/simplecov) is used to generate code test coverage reports. diff --git a/doc/integration/saml.md b/doc/integration/saml.md index fd01e9e0e56..b431d85cf3f 100644 --- a/doc/integration/saml.md +++ b/doc/integration/saml.md @@ -728,6 +728,11 @@ Refer to the documentation for your SAML Identity Provider for information on ho The [Generated passwords for users created through integrated authentication](../security/passwords_for_integrated_authentication_methods.md) guide provides an overview of how GitLab generates and sets passwords for users created via SAML. +Users authenticated with SSO or SAML must not use a password for Git operations over HTTPS. These users can do one of the following instead: + +- Set up a [personal access token](../user/profile/personal_access_tokens.md). +- Use the [Git Credential Manager](../user/profile/account/two_factor_authentication.md#git-credential-manager) which securely authenticates using OAuth. + ## Link SAML identity for an existing user A user can manually link their SAML identity to an existing GitLab account by following the steps in |