CE upstream

Unmerged paths: (use "git add/rm ..." as appropriate to mark resolution)

```
both modified:   Gemfile.lock
both modified:   app/assets/javascripts/diff_notes/diff_notes_bundle.js.es6
both modified:   app/assets/javascripts/merge_request_widget.js.es6
both modified:   app/assets/javascripts/protected_branches/protected_branch_dropdown.js.es6
both modified:   app/assets/javascripts/protected_branches/protected_branch_edit.js.es6
both modified:   app/assets/stylesheets/framework/variables.scss
both added:      app/controllers/concerns/oauth_applications.rb
both modified:   app/controllers/concerns/service_params.rb
both modified:   app/helpers/projects_helper.rb
both modified:   app/helpers/sorting_helper.rb
both modified:   app/models/project.rb
both modified:   app/policies/group_member_policy.rb
both modified:   app/policies/group_policy.rb
both modified:   app/views/projects/merge_requests/widget/_open.html.haml
both modified:   app/views/projects/merge_requests/widget/open/_accept.html.haml
both added:      changelogs/unreleased/25482-fix-api-sudo.yml
both modified:   config/application.rb
both modified:   config/gitlab.yml.example
both modified:   db/schema.rb
both modified:   doc/README.md
deleted by them: features/admin/settings.feature
both modified:   features/steps/shared/paths.rb
both modified:   lib/api/helpers.rb
both modified:   public/500.html
both modified:   public/502.html
both modified:   spec/features/admin/admin_settings_spec.rb
both modified:   spec/javascripts/awards_handler_spec.js
both modified:   spec/lib/gitlab/auth_spec.rb
both modified:   spec/models/project_services/chat_message/pipeline_message_spec.rb
both modified:   spec/requests/api/helpers_spec.rb
```

See merge request !974