summaryrefslogtreecommitdiff
path: root/app/controllers/admin
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2017-07-24 17:45:12 -0300
committerRobert Speicher <rspeicher@gmail.com>2017-07-27 12:09:46 -0400
commite561b142fa7c9dd636fd056fc0a6c84961d0cd46 (patch)
tree10e34698af1d5a3647840faee470e6047b782e30 /app/controllers/admin
parent9981814514742a2ee507d4dcc2fd71099fd96585 (diff)
downloadgitlab-ce-e561b142fa7c9dd636fd056fc0a6c84961d0cd46.tar.gz
Backport gitlab-ee!2456
Diffstat (limited to 'app/controllers/admin')
-rw-r--r--app/controllers/admin/applications_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/applications_controller.rb b/app/controllers/admin/applications_controller.rb
index 434ff6b2a62..4cb6e63d5e3 100644
--- a/app/controllers/admin/applications_controller.rb
+++ b/app/controllers/admin/applications_controller.rb
@@ -50,6 +50,6 @@ class Admin::ApplicationsController < Admin::ApplicationController
# Only allow a trusted parameter "white list" through.
def application_params
- params[:doorkeeper_application].permit(:name, :redirect_uri, :scopes)
+ params[:doorkeeper_application].permit(:name, :redirect_uri, :trusted, :scopes)
end
end