Merge remote-tracking branch 'upstream/master' into use-git-branch-mergeduse-git-branch-merged

* upstream/master: (56 commits)
  Resolve "Remove overzealous tooltips in projects page tabs"
  Remove filter icon from search bar
  Don't rename groups/projects that aren't reserved anymore
  Memoize GitLab logger to reduce open file descriptors
  Update groups API documentation
  Changing the smallest of typos
  Remove `<script>` and `<template>` from CHANGELOG.md
  Support `Gitaly::User`'s gl_username field
  Fix icon color and btn-group alignment of discussion buttons
  Simple docs fixes
  Fix button type
  Changes after review
  fixed karma tests
  Removes group_avatar & group_label_subscription from global namespace
  Fix CSS in load more participants
  Fix the description of the new branch created by an issue's new branch button
  Fix a small typo in the delete merged branches documentation
  spec fixes
  Remove Sherlock usage from the performance bar
  moved to eventHub to manage creating new files removed an ID from the CSS
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/app/assets/javascripts/repo/components/repo_tab.vue b/app/assets/javascripts/repo/components/repo_tab.vue
index 098715915b0..405d7b4cf86 100644
--- a/app/assets/javascripts/repo/components/repo_tab.vue
+++ b/app/assets/javascripts/repo/components/repo_tab.vue
@@ -18,8 +18,8 @@ const RepoTab = {
     },
     changedClass() {
       const tabChangedObj = {
-        'fa-times close-icon': !this.tab.changed,
-        'fa-circle unsaved-icon': this.tab.changed,
+        'fa-times close-icon': !this.tab.changed && !this.tab.tempFile,
+        'fa-circle unsaved-icon': this.tab.changed || this.tab.tempFile,
       };
       return tabChangedObj;
     },
@@ -30,7 +30,7 @@ const RepoTab = {
       Store.setActiveFiles(file);
     },
     closeTab(file) {
-      if (file.changed) return;
+      if (file.changed || file.tempFile) return;
 
       Store.removeFromOpenedFiles(file);
     },