diff options
author | Phil Hughes <me@iamphill.com> | 2018-03-21 11:06:39 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-03-22 10:33:20 +0000 |
commit | ba63bda9550d3d66545e71de1f78a3089c7dc014 (patch) | |
tree | e45edc9102fd2ef9957c3def1642aa040e0d0253 /app/assets/javascripts/ide/components/repo_commit_section.vue | |
parent | 51c64f3fc7180732621d60f939bfe6157165040f (diff) | |
download | gitlab-ce-ba63bda9550d3d66545e71de1f78a3089c7dc014.tar.gz |
correctly stages and unstages files
after a commit the files are correctly reset
correctly enables the ability to have different staged & unstaged changes in the same file
Diffstat (limited to 'app/assets/javascripts/ide/components/repo_commit_section.vue')
-rw-r--r-- | app/assets/javascripts/ide/components/repo_commit_section.vue | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/javascripts/ide/components/repo_commit_section.vue b/app/assets/javascripts/ide/components/repo_commit_section.vue index d8d447b80f3..caa0f25c827 100644 --- a/app/assets/javascripts/ide/components/repo_commit_section.vue +++ b/app/assets/javascripts/ide/components/repo_commit_section.vue @@ -32,9 +32,8 @@ export default { }, }, computed: { - ...mapState(['stagedFiles', 'rightPanelCollapsed']), + ...mapState(['changedFiles', 'stagedFiles', 'rightPanelCollapsed']), ...mapState('commit', ['commitMessage', 'submitCommitLoading']), - ...mapGetters(['unstagedFiles']), ...mapGetters('commit', [ 'commitButtonDisabled', 'discardDraftButtonDisabled', @@ -74,12 +73,12 @@ export default { </template> </modal> <template - v-if="unstagedFiles.length || stagedFiles.length" + v-if="changedFiles.length || stagedFiles.length" > <commit-files-list icon="unstaged" :title="__('Unstaged')" - :file-list="unstagedFiles" + :file-list="changedFiles" action="stageAllChanges" :action-btn-text="__('Stage all')" item-action-component="stage-button" |