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>2020-01-22 21:08:47 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-22 21:08:47 +0300
commit3832718d895bf8268f3e3aac85948e2792769345 (patch)
tree4a322399af568b6203e732ae2e2f3efc39b23a67 /app/controllers/admin
parent180cd023a11c0eb413ad0de124d9758ea25672bd (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/admin')
-rw-r--r--app/controllers/admin/applications_controller.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/admin/applications_controller.rb b/app/controllers/admin/applications_controller.rb
index 907b295870d..c017ecee054 100644
--- a/app/controllers/admin/applications_controller.rb
+++ b/app/controllers/admin/applications_controller.rb
@@ -55,6 +55,8 @@ class Admin::ApplicationsController < Admin::ApplicationController
# Only allow a trusted parameter "white list" through.
def application_params
- params.require(:doorkeeper_application).permit(:name, :redirect_uri, :trusted, :scopes)
+ params
+ .require(:doorkeeper_application)
+ .permit(:name, :redirect_uri, :trusted, :scopes, :confidential)
end
end