Commit c052f5a9 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'rename-squash-before-merge-vue-component' into 'master'

Rename squash before merge vue component

See merge request gitlab-org/gitlab-ce!21851
parents a1529944 aa5d83d4
/*
The squash-before-merge button is EE only, but it's located right in the middle
of the readyToMerge state component template.
If we didn't declare this component in CE, we'd need to maintain a separate copy
of the readyToMergeState template in EE, which is pretty big and likely to change.
Instead, in CE, we declare the component, but it's hidden and is configured to do nothing.
In EE, the configuration extends this object to add a functioning squash-before-merge
button.
*/
export default {
template: '',
};
...@@ -6,7 +6,7 @@ import MergeRequest from '../../../merge_request'; ...@@ -6,7 +6,7 @@ import MergeRequest from '../../../merge_request';
import Flash from '../../../flash'; import Flash from '../../../flash';
import statusIcon from '../mr_widget_status_icon.vue'; import statusIcon from '../mr_widget_status_icon.vue';
import eventHub from '../../event_hub'; import eventHub from '../../event_hub';
import SquashBeforeMerge from './mr_widget_squash_before_merge.vue'; import SquashBeforeMerge from './squash_before_merge.vue';
export default { export default {
name: 'ReadyToMerge', name: 'ReadyToMerge',
......
...@@ -40,7 +40,7 @@ export { default as MRWidgetService } from './services/mr_widget_service'; ...@@ -40,7 +40,7 @@ export { default as MRWidgetService } from './services/mr_widget_service';
export { default as eventHub } from './event_hub'; export { default as eventHub } from './event_hub';
export { default as getStateKey } from './stores/get_state_key'; export { default as getStateKey } from './stores/get_state_key';
export { default as stateMaps } from './stores/state_maps'; export { default as stateMaps } from './stores/state_maps';
export { default as SquashBeforeMerge } from './components/states/mr_widget_squash_before_merge.vue'; export { default as SquashBeforeMerge } from './components/states/squash_before_merge.vue';
export { default as notify } from '../lib/utils/notify'; export { default as notify } from '../lib/utils/notify';
export { default as SourceBranchRemovalStatus } from './components/source_branch_removal_status.vue'; export { default as SourceBranchRemovalStatus } from './components/source_branch_removal_status.vue';
......
---
title: Rename squash before merge vue component
merge_request: 21851
author: George Tsiolis
type: other
...@@ -19,7 +19,7 @@ module QA ...@@ -19,7 +19,7 @@ module QA
element :no_fast_forward_message, 'Fast-forward merge is not possible' element :no_fast_forward_message, 'Fast-forward merge is not possible'
end end
view 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.vue' do view 'app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue' do
element :squash_checkbox element :squash_checkbox
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment