CE upstream: Friday

Conflicts:

both modified:   app/assets/stylesheets/pages/settings.scss
both modified:   app/helpers/application_settings_helper.rb
both modified:   app/models/group.rb
both modified:   app/models/merge_request.rb
both modified:   app/services/users/build_service.rb
both modified:   doc/user/project/quick_actions.md
both modified:   features/steps/project/redirects.rb
both modified:   lib/api/helpers/runner.rb
both modified:   lib/gitlab/auth.rb
both modified:   package.json
both modified:   spec/services/quick_actions/interpret_service_spec.rb