27a75ea175
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: * removed rebase license check * renamed migration (changed timestamp) Closes #40301
45 lines
3.3 KiB
JavaScript
45 lines
3.3 KiB
JavaScript
/**
|
|
* This file is the centerpiece of an attempt to reduce potential conflicts
|
|
* between the CE and EE versions of the MR widget. EE additions to the MR widget should
|
|
* be contained in the ee/vue_merge_request_widget directory, and should **extend**
|
|
* rather than mutate CE MR Widget code.
|
|
*
|
|
* This file should be the only source of conflicts between EE and CE. EE-only components should
|
|
* imported directly where they are needed, and import paths for EE extensions of CE components
|
|
* should overwrite import paths **without** changing the order of dependencies listed here.
|
|
*/
|
|
|
|
export { default as Vue } from 'vue';
|
|
export { default as SmartInterval } from '~/smart_interval';
|
|
export { default as WidgetHeader } from './components/mr_widget_header';
|
|
export { default as WidgetMergeHelp } from './components/mr_widget_merge_help';
|
|
export { default as WidgetPipeline } from './components/mr_widget_pipeline.vue';
|
|
export { default as WidgetDeployment } from './components/mr_widget_deployment';
|
|
export { default as WidgetRelatedLinks } from './components/mr_widget_related_links';
|
|
export { default as MergedState } from './components/states/mr_widget_merged';
|
|
export { default as FailedToMerge } from './components/states/mr_widget_failed_to_merge';
|
|
export { default as ClosedState } from './components/states/mr_widget_closed';
|
|
export { default as MergingState } from './components/states/mr_widget_merging';
|
|
export { default as WipState } from './components/states/mr_widget_wip';
|
|
export { default as ArchivedState } from './components/states/mr_widget_archived';
|
|
export { default as ConflictsState } from './components/states/mr_widget_conflicts';
|
|
export { default as NothingToMergeState } from './components/states/mr_widget_nothing_to_merge';
|
|
export { default as MissingBranchState } from './components/states/mr_widget_missing_branch';
|
|
export { default as NotAllowedState } from './components/states/mr_widget_not_allowed';
|
|
export { default as ReadyToMergeState } from './components/states/mr_widget_ready_to_merge';
|
|
export { default as SHAMismatchState } from './components/states/mr_widget_sha_mismatch';
|
|
export { default as UnresolvedDiscussionsState } from './components/states/mr_widget_unresolved_discussions';
|
|
export { default as PipelineBlockedState } from './components/states/mr_widget_pipeline_blocked';
|
|
export { default as PipelineFailedState } from './components/states/mr_widget_pipeline_failed';
|
|
export { default as MergeWhenPipelineSucceedsState } from './components/states/mr_widget_merge_when_pipeline_succeeds';
|
|
export { default as RebaseState } from './components/states/mr_widget_rebase.vue';
|
|
export { default as AutoMergeFailed } from './components/states/mr_widget_auto_merge_failed';
|
|
export { default as CheckingState } from './components/states/mr_widget_checking';
|
|
export { default as MRWidgetStore } from './stores/mr_widget_store';
|
|
export { default as MRWidgetService } from './services/mr_widget_service';
|
|
export { default as eventHub } from './event_hub';
|
|
export { default as getStateKey } from './stores/get_state_key';
|
|
export { default as mrWidgetOptions } from './mr_widget_options';
|
|
export { default as stateMaps } from './stores/state_maps';
|
|
export { default as SquashBeforeMerge } from './components/states/mr_widget_squash_before_merge';
|
|
export { default as notify } from '../lib/utils/notify';
|