CE upstream
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 modified: app/controllers/concerns/service_params.rb
both modified: app/models/project.rb
both modified: app/policies/group_policy.rb
both modified: db/schema.rb
deleted by them: features/admin/settings.feature
both modified: features/steps/shared/paths.rb
both modified: spec/features/admin/admin_settings_spec.rb
both modified: spec/javascripts/awards_handler_spec.js