-
- Downloads
Merge branch 'jivanvl-remove-auto-merge-labels-ff' into 'master'
Remove the auto_merge_labels_mr_widget feature flag See merge request gitlab-org/gitlab!120922 Merged-by:Jose Ivan Vargas <jvargas@gitlab.com> Reviewed-by:
Showing
- app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue 8 additions, 33 deletions...merge_request_widget/components/states/ready_to_merge.vue
- app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js 0 additions, 4 deletions...scripts/vue_merge_request_widget/mixins/ready_to_merge.js
- app/controllers/projects/merge_requests_controller.rb 0 additions, 1 deletionapp/controllers/projects/merge_requests_controller.rb
- config/feature_flags/development/auto_merge_labels_mr_widget.yml 0 additions, 8 deletions...feature_flags/development/auto_merge_labels_mr_widget.yml
- ee/app/assets/javascripts/vue_merge_request_widget/components/merge_train_helper_icon.vue 0 additions, 62 deletions...rge_request_widget/components/merge_train_helper_icon.vue
- ee/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js 0 additions, 17 deletions...scripts/vue_merge_request_widget/mixins/ready_to_merge.js
- ee/spec/features/merge_request/user_merges_immediately_spec.rb 0 additions, 33 deletions...ec/features/merge_request/user_merges_immediately_spec.rb
- ee/spec/features/merge_trains/user_adds_merge_request_to_merge_train_spec.rb 10 additions, 8 deletions...rge_trains/user_adds_merge_request_to_merge_train_spec.rb
- ee/spec/features/merge_trains/user_adds_to_merge_train_when_pipeline_succeeds_spec.rb 13 additions, 10 deletions...s/user_adds_to_merge_train_when_pipeline_succeeds_spec.rb
- ee/spec/frontend/vue_merge_request_widget/components/merge_train_helper_icon_spec.js 0 additions, 39 deletions...request_widget/components/merge_train_helper_icon_spec.js
- ee/spec/frontend/vue_merge_request_widget/components/states/mr_widget_ready_to_merge_spec.js 2 additions, 100 deletions...widget/components/states/mr_widget_ready_to_merge_spec.js
- locale/gitlab.pot 0 additions, 12 deletionslocale/gitlab.pot
- spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb 0 additions, 141 deletions...rge_request/user_merges_only_if_pipeline_succeeds_spec.rb
- spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb 0 additions, 157 deletions.../merge_request/user_merges_when_pipeline_succeeds_spec.rb
- spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb 4 additions, 51 deletions...s/merge_request/user_sees_merge_request_pipelines_spec.rb
- spec/frontend/vue_merge_request_widget/components/states/mr_widget_ready_to_merge_spec.js 4 additions, 35 deletions...widget/components/states/mr_widget_ready_to_merge_spec.js
Loading
Please register or sign in to comment