diff options
author | Winnie Hellmann <winnie@gitlab.com> | 2018-02-28 21:47:44 +0000 |
---|---|---|
committer | Winnie Hellmann <winnie@gitlab.com> | 2018-03-22 10:48:17 +0100 |
commit | 07487628f4c900f4eb09e3cf11a525be0498bd58 (patch) | |
tree | a057cb4dcba0fa57966f4a98fe45cc92df1fdf90 /app/assets/javascripts/ide/components/repo_commit_section.vue | |
parent | 9b4b79fffe3b93c2479c31873073d6a7f93baf5a (diff) | |
download | gitlab-ce-07487628f4c900f4eb09e3cf11a525be0498bd58.tar.gz |
Rename modal.vue to deprecated_modal.vuewinh-deprecate-old-modal
Diffstat (limited to 'app/assets/javascripts/ide/components/repo_commit_section.vue')
-rw-r--r-- | app/assets/javascripts/ide/components/repo_commit_section.vue | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/app/assets/javascripts/ide/components/repo_commit_section.vue b/app/assets/javascripts/ide/components/repo_commit_section.vue index d772cab2d0e..d885ed5e301 100644 --- a/app/assets/javascripts/ide/components/repo_commit_section.vue +++ b/app/assets/javascripts/ide/components/repo_commit_section.vue @@ -2,7 +2,7 @@ import { mapState, mapActions, mapGetters } from 'vuex'; import tooltip from '~/vue_shared/directives/tooltip'; import icon from '~/vue_shared/components/icon.vue'; -import modal from '~/vue_shared/components/modal.vue'; +import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue'; import LoadingButton from '~/vue_shared/components/loading_button.vue'; import commitFilesList from './commit_sidebar/list.vue'; import * as consts from '../stores/modules/commit/constants'; @@ -10,7 +10,7 @@ import Actions from './commit_sidebar/actions.vue'; export default { components: { - modal, + DeprecatedModal, icon, commitFilesList, Actions, @@ -37,23 +37,20 @@ export default { 'lastCommitMsg', 'changedFiles', ]), - ...mapState('commit', [ - 'commitMessage', - 'submitCommitLoading', - ]), + ...mapState('commit', ['commitMessage', 'submitCommitLoading']), ...mapGetters('commit', [ 'commitButtonDisabled', 'discardDraftButtonDisabled', 'branchName', ]), statusSvg() { - return this.lastCommitMsg ? this.committedStateSvgPath : this.noChangesStateSvgPath; + return this.lastCommitMsg + ? this.committedStateSvgPath + : this.noChangesStateSvgPath; }, }, methods: { - ...mapActions([ - 'setPanelCollapsedStatus', - ]), + ...mapActions(['setPanelCollapsedStatus']), ...mapActions('commit', [ 'updateCommitMessage', 'discardDraft', @@ -67,8 +64,9 @@ export default { }); }, forceCreateNewBranch() { - return this.updateCommitAction(consts.COMMIT_TO_NEW_BRANCH) - .then(() => this.commitChanges()); + return this.updateCommitAction(consts.COMMIT_TO_NEW_BRANCH).then(() => + this.commitChanges(), + ); }, }, }; @@ -81,7 +79,7 @@ export default { 'multi-file-commit-empty-state-container': !changedFiles.length }" > - <modal + <deprecated-modal id="ide-create-branch-modal" :primary-button-label="__('Create new branch')" kind="success" @@ -92,7 +90,7 @@ export default { {{ __(`This branch has changed since you started editing. Would you like to create a new branch?`) }} </template> - </modal> + </deprecated-modal> <commit-files-list title="Staged" :file-list="changedFiles" |