diff options
Diffstat (limited to 'app/controllers/groups/settings/applications_controller.rb')
| -rw-r--r-- | app/controllers/groups/settings/applications_controller.rb | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/app/controllers/groups/settings/applications_controller.rb b/app/controllers/groups/settings/applications_controller.rb index cefb5425867..f05a96d7810 100644 --- a/app/controllers/groups/settings/applications_controller.rb +++ b/app/controllers/groups/settings/applications_controller.rb @@ -54,8 +54,10 @@ module Groups # https://gitlab.com/gitlab-org/gitlab/-/issues/324187 @applications = @group.oauth_applications.limit(100) - # Don't overwrite a value possibly set by `create` - @application ||= Doorkeeper::Application.new + # Default access tokens to expire. This preserves backward compatibility + # with existing applications. This will be removed in 15.0. + # Removal issue: https://gitlab.com/gitlab-org/gitlab/-/issues/340848 + @application ||= Doorkeeper::Application.new(expire_access_tokens: true) end def set_application @@ -63,12 +65,9 @@ module Groups end def application_params - params - .require(:doorkeeper_application) - .permit(:name, :redirect_uri, :scopes, :confidential) - .tap do |params| - params[:owner] = @group - end + super.tap do |params| + params[:owner] = @group + end end end end |