-
- Downloads
There was a problem fetching the pipeline summary.
Backport 'Rebase' feature from EE to CE
When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * fix for !3732 is not incorporated in this backport yet * removed rebase license check * renamed migration (changed timestamp) Closes #40301
Showing
- app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.js 132 additions, 0 deletions...erge_request_widget/components/states/mr_widget_rebase.js
- app/assets/javascripts/vue_merge_request_widget/dependencies.js 1 addition, 0 deletions...sets/javascripts/vue_merge_request_widget/dependencies.js
- app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js 3 additions, 0 deletions...javascripts/vue_merge_request_widget/mr_widget_options.js
- app/assets/javascripts/vue_merge_request_widget/services/mr_widget_service.js 5 additions, 0 deletions...ts/vue_merge_request_widget/services/mr_widget_service.js
- app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js 2 additions, 0 deletions...ascripts/vue_merge_request_widget/stores/get_state_key.js
- app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js 8 additions, 0 deletions...cripts/vue_merge_request_widget/stores/mr_widget_store.js
- app/assets/javascripts/vue_merge_request_widget/stores/state_maps.js 3 additions, 0 deletions...javascripts/vue_merge_request_widget/stores/state_maps.js
- app/controllers/projects/merge_requests_controller.rb 17 additions, 0 deletionsapp/controllers/projects/merge_requests_controller.rb
- app/models/merge_request.rb 8 additions, 1 deletionapp/models/merge_request.rb
- app/models/repository.rb 7 additions, 0 deletionsapp/models/repository.rb
- app/presenters/merge_request_presenter.rb 18 additions, 0 deletionsapp/presenters/merge_request_presenter.rb
- app/serializers/merge_request_basic_entity.rb 1 addition, 0 deletionsapp/serializers/merge_request_basic_entity.rb
- app/serializers/merge_request_widget_entity.rb 10 additions, 0 deletionsapp/serializers/merge_request_widget_entity.rb
- app/services/merge_requests/rebase_service.rb 30 additions, 0 deletionsapp/services/merge_requests/rebase_service.rb
- app/services/merge_requests/working_copy_base_service.rb 24 additions, 0 deletionsapp/services/merge_requests/working_copy_base_service.rb
- app/views/projects/_merge_request_fast_forward_settings.html.haml 1 addition, 1 deletion...s/projects/_merge_request_fast_forward_settings.html.haml
- app/views/projects/_merge_request_rebase_settings.html.haml 1 addition, 1 deletionapp/views/projects/_merge_request_rebase_settings.html.haml
- app/workers/all_queues.yml 1 addition, 0 deletionsapp/workers/all_queues.yml
- app/workers/rebase_worker.rb 12 additions, 0 deletionsapp/workers/rebase_worker.rb
- changelogs/unreleased/40301-rebase.yml 5 additions, 0 deletionschangelogs/unreleased/40301-rebase.yml
app/workers/rebase_worker.rb
0 → 100644
changelogs/unreleased/40301-rebase.yml
0 → 100644
Please register or sign in to comment