diff options
| author | Phil Hughes <me@iamphill.com> | 2018-05-02 13:47:36 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-05-02 13:47:36 +0300 |
| commit | 6bcde61b92a401b221f0d0b956001cb94e3cd9fd (patch) | |
| tree | ca152128dfd1395e0d9cbfd5367d1495a755e479 /app/assets/javascripts/ide/components/repo_tab.vue | |
| parent | cf2def427590524e79056b46cee19ecea381f0d8 (diff) | |
disabled commit view when no changes are available
remove close button in tab
fix height not working in form
restored stage & unstage all changes
disable merge request radio button when staged & unstaged changes exist
Diffstat (limited to 'app/assets/javascripts/ide/components/repo_tab.vue')
| -rw-r--r-- | app/assets/javascripts/ide/components/repo_tab.vue | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/ide/components/repo_tab.vue b/app/assets/javascripts/ide/components/repo_tab.vue index b3221deada0..fb26b973236 100644 --- a/app/assets/javascripts/ide/components/repo_tab.vue +++ b/app/assets/javascripts/ide/components/repo_tab.vue @@ -32,6 +32,8 @@ export default { return `Close ${this.tab.name}`; }, showChangedIcon() { + if (this.tab.pending) return true; + return this.fileHasChanged ? !this.tabMouseOver : false; }, fileHasChanged() { @@ -91,6 +93,7 @@ export default { class="multi-file-tab-close" @click.stop.prevent="closeFile(tab)" :aria-label="closeLabel" + :disabled="tab.pending" > <icon v-if="!showChangedIcon" |