diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-23 03:15:54 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-23 03:15:54 +0000 |
| commit | 8c1c323ac04b24b1167540893af699928ce8c156 (patch) | |
| tree | 87be61cad0cdb7d3255a3f46f702de86835df218 | |
| parent | a7698afc6e7a5a6e4e5044f5b310a2c69c554053 (diff) | |
| download | gitlab-ce-8c1c323ac04b24b1167540893af699928ce8c156.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | doc/integration/omniauth.md | 5 | ||||
| -rw-r--r-- | locale/gitlab.pot | 15 |
2 files changed, 18 insertions, 2 deletions
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md index 1aaf815ae86..55d1d1bcbb8 100644 --- a/doc/integration/omniauth.md +++ b/doc/integration/omniauth.md @@ -439,8 +439,9 @@ then override the icon in one of two ways: ## Change apps or configuration -Because GitLab doesn't support having multiple providers in OAuth, GitLab configuration and user identification must be -updated at the same time if the provider or app is changed. +Because OAuth in GitLab doesn't support setting the same external authentication and authorization provider as multiple providers, GitLab configuration and +user identification must be updated at the same time if the provider or app is changed. +For example, you can set up `saml` and `azure_activedirectory_v2` but cannot add a second `azure_activedirectory_v2` to the same configuration. These instructions apply to all methods of authentication where GitLab stores an `extern_uid` and it is the only data used for user authentication. diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 9698d43f6a5..454d086f7a6 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -35929,6 +35929,9 @@ msgstr "" msgid "SecurityReports|Create issue" msgstr "" +msgid "SecurityReports|Detection" +msgstr "" + msgid "SecurityReports|Development vulnerabilities" msgstr "" @@ -35941,6 +35944,9 @@ msgstr "" msgid "SecurityReports|Dismissed '%{vulnerabilityName}'. Turn off the hide dismissed toggle to view." msgstr "" +msgid "SecurityReports|Does not have issue" +msgstr "" + msgid "SecurityReports|Download %{artifactName}" msgstr "" @@ -35971,12 +35977,18 @@ msgstr "" msgid "SecurityReports|Failed to get security report information. Please reload the page or try again later." msgstr "" +msgid "SecurityReports|Has issue" +msgstr "" + msgid "SecurityReports|Hide dismissed" msgstr "" msgid "SecurityReports|Image" msgstr "" +msgid "SecurityReports|Issue" +msgstr "" + msgid "SecurityReports|Issue Created" msgstr "" @@ -36094,6 +36106,9 @@ msgstr "" msgid "SecurityReports|Status" msgstr "" +msgid "SecurityReports|Still Detected" +msgstr "" + msgid "SecurityReports|Submit vulnerability" msgstr "" |