Default to subtle MR mege button until CI status is available
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9245 Conflicts: app/assets/javascripts/merge_request_widget.js.es6 app/views/projects/merge_requests/widget/open/_accept.html.haml
显示
- app/assets/javascripts/merge_request_widget.js.es6 28 个添加, 19 个删除app/assets/javascripts/merge_request_widget.js.es6
- app/assets/javascripts/merge_request_widget/ci_bundle.js.es6 5 个添加, 5 个删除app/assets/javascripts/merge_request_widget/ci_bundle.js.es6
- app/assets/stylesheets/pages/merge_requests.scss 7 个添加, 1 个删除app/assets/stylesheets/pages/merge_requests.scss
- app/controllers/projects/merge_requests_controller.rb 4 个添加, 1 个删除app/controllers/projects/merge_requests_controller.rb
- app/models/merge_request.rb 4 个添加, 1 个删除app/models/merge_request.rb
- app/views/projects/merge_requests/widget/open/_accept.html.haml 4 个添加, 6 个删除...ews/projects/merge_requests/widget/open/_accept.html.haml
- changelogs/unreleased/28010-mr-merge-button-default-to-danger.yml 4 个添加, 0 个删除...gs/unreleased/28010-mr-merge-button-default-to-danger.yml
- spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb 1 个添加, 1 个删除...es/merge_requests/merge_immediately_with_pipeline_spec.rb
- spec/features/merge_requests/widget_spec.rb 65 个添加, 2 个删除spec/features/merge_requests/widget_spec.rb
加载中
想要评论请 注册 或 登录