diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-03-07 16:16:08 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-03-07 16:16:08 +0000 |
| commit | de37dcee90ac44ba794ad504e91f18b8fb4b13a3 (patch) | |
| tree | 8be4fd7cbbe1f1a06dfdfa1da12616989e28d783 /app/controllers/admin | |
| parent | 6a52cda31da4becc3e342530a2bdf0868d8921cc (diff) | |
| parent | b2ca28d24bfbb0a574fccdf1ea05d549ccd6bf66 (diff) | |
| download | gitlab-ce-de37dcee90ac44ba794ad504e91f18b8fb4b13a3.tar.gz | |
Merge branch 'siemens/gitlab-ce-feature/openid-connect'
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/applications_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/applications_controller.rb b/app/controllers/admin/applications_controller.rb index 62f62e99a97..9c9f420c1e0 100644 --- a/app/controllers/admin/applications_controller.rb +++ b/app/controllers/admin/applications_controller.rb @@ -2,7 +2,7 @@ class Admin::ApplicationsController < Admin::ApplicationController include OauthApplications before_action :set_application, only: [:show, :edit, :update, :destroy] - before_action :load_scopes, only: [:new, :edit] + before_action :load_scopes, only: [:new, :create, :edit, :update] def index @applications = Doorkeeper::Application.where("owner_id IS NULL") |