diff options
author | Natalia Tepluhina <ntepluhina@gitlab.com> | 2019-03-25 09:16:41 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-03-25 09:16:41 +0000 |
commit | a72241f4a92ab0b202eb3c7e03931857428237b6 (patch) | |
tree | 51d02b8aa0345b72a2708abd78baa160221b460d /app/assets | |
parent | 9e98ccf174410209e313956bcf10c0da0aec572f (diff) | |
download | gitlab-ce-a72241f4a92ab0b202eb3c7e03931857428237b6.tar.gz |
Fixed commit logic to pick a branch
- fixed getter spec with correct getter name
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/ide/components/commit_sidebar/radio_group.vue | 7 | ||||
-rw-r--r-- | app/assets/javascripts/ide/stores/modules/commit/getters.js | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/radio_group.vue b/app/assets/javascripts/ide/components/commit_sidebar/radio_group.vue index 2b44438f849..9161eb3d9b1 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/radio_group.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/radio_group.vue @@ -38,8 +38,8 @@ export default { }, }, computed: { - ...mapState('commit', ['commitAction']), - ...mapGetters('commit', ['newBranchName']), + ...mapState('commit', ['commitAction', 'newBranchName']), + ...mapGetters('commit', ['placeholderBranchName']), tooltipTitle() { return this.disabled ? this.title : ''; }, @@ -73,7 +73,8 @@ export default { </label> <div v-if="commitAction === value && showInput" class="ide-commit-new-branch"> <input - :placeholder="newBranchName" + :placeholder="placeholderBranchName" + :value="newBranchName" type="text" class="form-control monospace" @input="updateBranchName($event.target.value)" diff --git a/app/assets/javascripts/ide/stores/modules/commit/getters.js b/app/assets/javascripts/ide/stores/modules/commit/getters.js index 03777e6c10b..bbe40b2ec2f 100644 --- a/app/assets/javascripts/ide/stores/modules/commit/getters.js +++ b/app/assets/javascripts/ide/stores/modules/commit/getters.js @@ -14,7 +14,7 @@ const createTranslatedTextForFiles = (files, text) => { export const discardDraftButtonDisabled = state => state.commitMessage === '' || state.submitCommitLoading; -export const newBranchName = (state, _, rootState) => +export const placeholderBranchName = (state, _, rootState) => `${gon.current_username}-${rootState.currentBranchId}-patch-${`${new Date().getTime()}`.substr( -BRANCH_SUFFIX_COUNT, )}`; @@ -25,7 +25,7 @@ export const branchName = (state, getters, rootState) => { state.commitAction === consts.COMMIT_TO_NEW_BRANCH_MR ) { if (state.newBranchName === '') { - return getters.newBranchName; + return getters.placeholderBranchName; } return state.newBranchName; |