Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-09-26 15:10:48 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-09-26 15:10:48 +0300
commitcd5179ede2020b45b4de70a10fb09cfcfe85c3df (patch)
tree57e78abcff2613b8915228bf1a01c8db0aa3caee /app/controllers
parent576bba90f9b4b4fdd604871805469f57c147e07c (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/admin/identities_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/identities_controller.rb b/app/controllers/admin/identities_controller.rb
index 15c4103a781..17b0adb868e 100644
--- a/app/controllers/admin/identities_controller.rb
+++ b/app/controllers/admin/identities_controller.rb
@@ -63,6 +63,6 @@ class Admin::IdentitiesController < Admin::ApplicationController
end
def identity_params
- params.require(:identity).permit(:provider, :extern_uid)
+ params.require(:identity).permit(:provider, :extern_uid, :saml_provider_id)
end
end