kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Rename squash before merge vue component

This commit is contained in:
George Tsiolis 2018-09-21 13:07:17 +03:00
parent a293640404
commit aa5d83d4c3
6 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.js
View File

@ -1,15 +0,0 @@
/*
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: '',
};

2
app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
View File

@ -6,7 +6,7 @@ import MergeRequest from '../../../merge_request';
import Flash from '../../../flash';
import statusIcon from '../mr_widget_status_icon.vue';
import eventHub from '../../event_hub';
import SquashBeforeMerge from './mr_widget_squash_before_merge.vue';
import SquashBeforeMerge from './squash_before_merge.vue';
export default {
name: 'ReadyToMerge',

0
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.vue → app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue
View File

2
app/assets/javascripts/vue_merge_request_widget/dependencies.js
View File

@ -40,7 +40,7 @@ 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 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 SourceBranchRemovalStatus } from './components/source_branch_removal_status.vue';

5
changelogs/unreleased/rename-squash-before-merge-vue-component.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Rename squash before merge vue component
merge_request: 21851
author: George Tsiolis
type: other

2
qa/qa/page/merge_request/show.rb
View File

@ -19,7 +19,7 @@ module QA
element :no_fast_forward_message, 'Fast-forward merge is not possible'
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
end