diff options
| author | Phil Hughes <me@iamphill.com> | 2018-05-14 18:47:35 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-05-14 18:47:35 +0300 |
| commit | 6a77a6a11f28fe94ac17f389ff1e5ea0ea53ac20 (patch) | |
| tree | ad58409cef989b64391347bf0e851b82fc9b00a6 | |
| parent | 59ef79689e0ffe7e693c1eb3e2db1ed417e63a9c (diff) | |
| parent | e286942185b85149f21531e491c0c93a04acbe0f (diff) | |
Merge branch 'refactor/move-squash-before-merge-vue-component' into 'master'
Move SquashBeforeMerge vue component
See merge request gitlab-org/gitlab-ce!18813
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.vue (renamed from app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.js) | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/dependencies.js | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/refactor-move-squash-before-merge-vue-component.yml | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.vue index bf8628d18a6..926a3172412 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.vue @@ -10,6 +10,6 @@ In EE, the configuration extends this object to add a functioning squash-before- button. */ -export default { - template: '', -}; +<script> + export default {}; +</script> diff --git a/app/assets/javascripts/vue_merge_request_widget/dependencies.js b/app/assets/javascripts/vue_merge_request_widget/dependencies.js index c056d2a8709..15097fa2a3f 100644 --- a/app/assets/javascripts/vue_merge_request_widget/dependencies.js +++ b/app/assets/javascripts/vue_merge_request_widget/dependencies.js @@ -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'; +export { default as SquashBeforeMerge } from './components/states/mr_widget_squash_before_merge.vue'; export { default as notify } from '../lib/utils/notify'; export { default as SourceBranchRemovalStatus } from './components/source_branch_removal_status.vue'; diff --git a/changelogs/unreleased/refactor-move-squash-before-merge-vue-component.yml b/changelogs/unreleased/refactor-move-squash-before-merge-vue-component.yml new file mode 100644 index 00000000000..b8b2762a21d --- /dev/null +++ b/changelogs/unreleased/refactor-move-squash-before-merge-vue-component.yml @@ -0,0 +1,5 @@ +--- +title: Move SquashBeforeMerge vue component +merge_request: 18813 +author: George Tsiolis +type: performance |