From c4201f103662f5ff9eb064890a10352ec03bc495 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 18 Apr 2018 12:55:24 +0100
Subject: Added changes count to web IDE folder

#44846
---
 app/assets/javascripts/ide/components/repo_file.vue | 13 +++++++++++--
 app/assets/javascripts/ide/stores/getters.js        |  3 +++
 app/assets/stylesheets/pages/repo.scss              |  4 ++--
 3 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'app/assets')

diff --git a/app/assets/javascripts/ide/components/repo_file.vue b/app/assets/javascripts/ide/components/repo_file.vue
index 3b5068d4910..965a49d98cf 100644
--- a/app/assets/javascripts/ide/components/repo_file.vue
+++ b/app/assets/javascripts/ide/components/repo_file.vue
@@ -1,5 +1,5 @@
 <script>
-import { mapActions } from 'vuex';
+import { mapActions, mapGetters } from 'vuex';
 import skeletonLoadingContainer from '~/vue_shared/components/skeleton_loading_container.vue';
 import fileIcon from '~/vue_shared/components/file_icon.vue';
 import router from '../ide_router';
@@ -29,6 +29,10 @@ export default {
     },
   },
   computed: {
+    ...mapGetters(['getChangesInFolder']),
+    folderChangedCount() {
+      return this.getChangesInFolder(this.file.path);
+    },
     isTree() {
       return this.file.type === 'tree';
     },
@@ -101,9 +105,14 @@ export default {
           <mr-file-icon
             v-if="file.mrChange"
           />
+          <span
+            v-if="isTree && folderChangedCount > 0"
+          >
+            {{ folderChangedCount }}
+          </span>
           <changed-file-icon
+            v-else-if="file.changed || file.tempFile"
             :file="file"
-            v-if="file.changed || file.tempFile"
           />
         </span>
         <new-dropdown
diff --git a/app/assets/javascripts/ide/stores/getters.js b/app/assets/javascripts/ide/stores/getters.js
index a77cdbc13c8..775ab17e0c8 100644
--- a/app/assets/javascripts/ide/stores/getters.js
+++ b/app/assets/javascripts/ide/stores/getters.js
@@ -35,3 +35,6 @@ export const currentIcon = state =>
 export const hasChanges = state => !!state.changedFiles.length;
 
 export const hasMergeRequest = state => !!state.currentMergeRequestId;
+
+export const getChangesInFolder = state => path =>
+  state.changedFiles.filter(f => f.path.indexOf(path) === 0 && !f.tempFile).length;
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index 3a05a1cf2a9..d9dc2bfbefc 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -601,11 +601,11 @@
 }
 
 .multi-file-addition {
-  fill: $green-500;
+  color: $green-500;
 }
 
 .multi-file-modified {
-  fill: $orange-500;
+  color: $orange-500;
 }
 
 .multi-file-commit-list-collapsed {
-- 
cgit v1.2.1


From 293364c893bd64cf2fe2521c5b4bb2485ab09773 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 19 Apr 2018 09:27:16 +0100
Subject: updated styling changed to include new files added getter spec

---
 .../javascripts/ide/components/repo_file.vue       | 32 ++++++++++++++--------
 app/assets/javascripts/ide/stores/getters.js       |  2 +-
 app/assets/stylesheets/pages/repo.scss             | 10 ++++---
 3 files changed, 27 insertions(+), 17 deletions(-)

(limited to 'app/assets')

diff --git a/app/assets/javascripts/ide/components/repo_file.vue b/app/assets/javascripts/ide/components/repo_file.vue
index 965a49d98cf..d572e564b75 100644
--- a/app/assets/javascripts/ide/components/repo_file.vue
+++ b/app/assets/javascripts/ide/components/repo_file.vue
@@ -1,22 +1,24 @@
 <script>
 import { mapActions, mapGetters } from 'vuex';
-import skeletonLoadingContainer from '~/vue_shared/components/skeleton_loading_container.vue';
-import fileIcon from '~/vue_shared/components/file_icon.vue';
+import SkeletonLoadingContainer from '~/vue_shared/components/skeleton_loading_container.vue';
+import Icon from '~/vue_shared/components/icon.vue';
+import FileIcon from '~/vue_shared/components/file_icon.vue';
 import router from '../ide_router';
-import newDropdown from './new_dropdown/index.vue';
-import fileStatusIcon from './repo_file_status_icon.vue';
-import changedFileIcon from './changed_file_icon.vue';
-import mrFileIcon from './mr_file_icon.vue';
+import NewDropdown from './new_dropdown/index.vue';
+import FileStatusIcon from './repo_file_status_icon.vue';
+import ChangedFileIcon from './changed_file_icon.vue';
+import MrFileIcon from './mr_file_icon.vue';
 
 export default {
   name: 'RepoFile',
   components: {
-    skeletonLoadingContainer,
-    newDropdown,
-    fileStatusIcon,
-    fileIcon,
-    changedFileIcon,
-    mrFileIcon,
+    SkeletonLoadingContainer,
+    NewDropdown,
+    FileStatusIcon,
+    FileIcon,
+    ChangedFileIcon,
+    MrFileIcon,
+    Icon,
   },
   props: {
     file: {
@@ -107,8 +109,14 @@ export default {
           />
           <span
             v-if="isTree && folderChangedCount > 0"
+            class="ide-tree-changes"
           >
             {{ folderChangedCount }}
+            <icon
+              name="file-modified"
+              :size="12"
+              css-classes="prepend-left-5 multi-file-modified"
+            />
           </span>
           <changed-file-icon
             v-else-if="file.changed || file.tempFile"
diff --git a/app/assets/javascripts/ide/stores/getters.js b/app/assets/javascripts/ide/stores/getters.js
index 775ab17e0c8..7cdd511c045 100644
--- a/app/assets/javascripts/ide/stores/getters.js
+++ b/app/assets/javascripts/ide/stores/getters.js
@@ -37,4 +37,4 @@ export const hasChanges = state => !!state.changedFiles.length;
 export const hasMergeRequest = state => !!state.currentMergeRequestId;
 
 export const getChangesInFolder = state => path =>
-  state.changedFiles.filter(f => f.path.indexOf(path) === 0 && !f.tempFile).length;
+  state.changedFiles.filter(f => f.path.replace(new RegExp(`/${f.name}$`), '') === path).length;
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index d9dc2bfbefc..12a61c66685 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -66,10 +66,6 @@
       }
     }
 
-    .ide-file-changed-icon {
-      margin-left: auto;
-    }
-
     .ide-new-btn {
       display: none;
       margin-bottom: -4px;
@@ -909,3 +905,9 @@
   background: transparent;
   resize: none;
 }
+
+.ide-tree-changes {
+  display: flex;
+  align-items: center;
+  font-size: 12px;
+}
-- 
cgit v1.2.1


From dba40985d7318c75f1e09dab29792961f89429dd Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 19 Apr 2018 14:41:51 +0100
Subject: added support for staged files

---
 .../javascripts/ide/components/changed_file_icon.vue       | 10 ++--------
 .../ide/components/commit_sidebar/list_item.vue            |  2 +-
 app/assets/javascripts/ide/stores/getters.js               | 14 ++++++++++++--
 app/assets/stylesheets/pages/repo.scss                     |  4 ++--
 4 files changed, 17 insertions(+), 13 deletions(-)

(limited to 'app/assets')

diff --git a/app/assets/javascripts/ide/components/changed_file_icon.vue b/app/assets/javascripts/ide/components/changed_file_icon.vue
index 1fc11c84639..5fea64a33b4 100644
--- a/app/assets/javascripts/ide/components/changed_file_icon.vue
+++ b/app/assets/javascripts/ide/components/changed_file_icon.vue
@@ -36,7 +36,7 @@ export default {
       return `${this.changedIcon}-solid`;
     },
     changedIconClass() {
-      return `multi-${this.changedIcon} prepend-left-5 pull-left`;
+      return `multi-${this.changedIcon} pull-left`;
     },
     tooltipTitle() {
       if (!this.showTooltip) return undefined;
@@ -72,13 +72,7 @@ export default {
     class="ide-file-changed-icon"
   >
     <icon
-      v-if="file.staged && showStagedIcon"
-      :name="stagedIcon"
-      :size="12"
-      :css-classes="changedIconClass"
-    />
-    <icon
-      v-if="file.changed || file.tempFile || (file.staged && !showStagedIcon)"
+      v-if="file.changed || file.tempFile || file.staged"
       :name="changedIcon"
       :size="12"
       :css-classes="changedIconClass"
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
index ad4713c40d5..872302840e2 100644
--- a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
+++ b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
@@ -36,7 +36,7 @@ export default {
       return this.file.tempFile ? `file-addition${prefix}` : `file-modified${prefix}`;
     },
     iconClass() {
-      return `multi-file-${this.file.tempFile ? 'additions' : 'modified'} append-right-8`;
+      return `multi-file-${this.file.tempFile ? 'addition' : 'modified'} append-right-8`;
     },
   },
   methods: {
diff --git a/app/assets/javascripts/ide/stores/getters.js b/app/assets/javascripts/ide/stores/getters.js
index 4b93fb8dd93..9c5a3db82eb 100644
--- a/app/assets/javascripts/ide/stores/getters.js
+++ b/app/assets/javascripts/ide/stores/getters.js
@@ -42,7 +42,17 @@ export const collapseButtonTooltip = state =>
 
 export const hasMergeRequest = state => !!state.currentMergeRequestId;
 
-export const getChangesInFolder = state => path =>
-  state.changedFiles.filter(f => f.path.replace(new RegExp(`/${f.name}$`), '') === path).length;
+export const getChangesInFolder = state => path => {
+  const changedFilesCount = state.changedFiles.filter(
+    f => f.path.replace(new RegExp(`/${f.name}$`), '') === path,
+  ).length;
+  const stagedFilesCount = state.stagedFiles.filter(
+    f =>
+      f.path.replace(new RegExp(`/${f.name}$`), '') === path &&
+      !state.changedFiles.find(changedF => changedF.path === f.path),
+  ).length;
+
+  return changedFilesCount + stagedFilesCount;
+};
 
 export const getStagedFile = state => path => state.stagedFiles.find(f => f.path === path);
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index 9519d54288f..3de12a87572 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -589,8 +589,8 @@
   }
 }
 
-.multi-file-additions,
-.multi-file-additions-solid {
+.multi-file-addition,
+.multi-file-addition-solid {
   color: $green-500;
 }
 
-- 
cgit v1.2.1


From da5fab20ea05f0771a7c8eb4d309ec99d7cee6c2 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 20 Apr 2018 11:56:07 +0100
Subject: improve getters code

---
 app/assets/javascripts/ide/stores/getters.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'app/assets')

diff --git a/app/assets/javascripts/ide/stores/getters.js b/app/assets/javascripts/ide/stores/getters.js
index 9c5a3db82eb..de2d8837aff 100644
--- a/app/assets/javascripts/ide/stores/getters.js
+++ b/app/assets/javascripts/ide/stores/getters.js
@@ -43,13 +43,11 @@ export const collapseButtonTooltip = state =>
 export const hasMergeRequest = state => !!state.currentMergeRequestId;
 
 export const getChangesInFolder = state => path => {
-  const changedFilesCount = state.changedFiles.filter(
-    f => f.path.replace(new RegExp(`/${f.name}$`), '') === path,
-  ).length;
+  const filePatchMatches = f => f.path.replace(new RegExp(`/${f.name}$`), '') === path;
+  const changedFilesCount = state.changedFiles.filter(f => filePatchMatches(f)).length;
   const stagedFilesCount = state.stagedFiles.filter(
     f =>
-      f.path.replace(new RegExp(`/${f.name}$`), '') === path &&
-      !state.changedFiles.find(changedF => changedF.path === f.path),
+      filePatchMatches(f) && !state.changedFiles.find(changedFile => changedFile.path === f.path),
   ).length;
 
   return changedFilesCount + stagedFilesCount;
-- 
cgit v1.2.1


From ba3d5e655c9df89c31f70b7997a147218880096f Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 20 Apr 2018 12:26:52 +0100
Subject: fixed icon not showing for parents

---
 app/assets/javascripts/ide/stores/getters.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/assets')

diff --git a/app/assets/javascripts/ide/stores/getters.js b/app/assets/javascripts/ide/stores/getters.js
index de2d8837aff..d1fd1b2b2ee 100644
--- a/app/assets/javascripts/ide/stores/getters.js
+++ b/app/assets/javascripts/ide/stores/getters.js
@@ -43,7 +43,7 @@ export const collapseButtonTooltip = state =>
 export const hasMergeRequest = state => !!state.currentMergeRequestId;
 
 export const getChangesInFolder = state => path => {
-  const filePatchMatches = f => f.path.replace(new RegExp(`/${f.name}$`), '') === path;
+  const filePatchMatches = f => f.path.replace(new RegExp(`/${f.name}$`), '').indexOf(path) === 0;
   const changedFilesCount = state.changedFiles.filter(f => filePatchMatches(f)).length;
   const stagedFilesCount = state.stagedFiles.filter(
     f =>
-- 
cgit v1.2.1


From 1e9b57a242a122fae642f88c995a2c411c4213f8 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 20 Apr 2018 13:05:17 +0100
Subject: updated code to use getter to get changedFile

---
 app/assets/javascripts/ide/stores/getters.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/assets')

diff --git a/app/assets/javascripts/ide/stores/getters.js b/app/assets/javascripts/ide/stores/getters.js
index d1fd1b2b2ee..2e4129bcd48 100644
--- a/app/assets/javascripts/ide/stores/getters.js
+++ b/app/assets/javascripts/ide/stores/getters.js
@@ -42,15 +42,15 @@ export const collapseButtonTooltip = state =>
 
 export const hasMergeRequest = state => !!state.currentMergeRequestId;
 
-export const getChangesInFolder = state => path => {
-  const filePatchMatches = f => f.path.replace(new RegExp(`/${f.name}$`), '').indexOf(path) === 0;
-  const changedFilesCount = state.changedFiles.filter(f => filePatchMatches(f)).length;
+export const getChangesInFolder = (state, getters) => path => {
+  const filePathMatches = f => f.path.replace(new RegExp(`/${f.name}$`), '').indexOf(path) === 0;
+  const changedFilesCount = state.changedFiles.filter(f => filePathMatches(f)).length;
   const stagedFilesCount = state.stagedFiles.filter(
-    f =>
-      filePatchMatches(f) && !state.changedFiles.find(changedFile => changedFile.path === f.path),
+    f => filePathMatches(f) && !getters.getChangedFile(f.path),
   ).length;
 
   return changedFilesCount + stagedFilesCount;
 };
 
+export const getChangedFile = state => path => state.stagedFiles.find(f => f.path === path);
 export const getStagedFile = state => path => state.stagedFiles.find(f => f.path === path);
-- 
cgit v1.2.1


From a6ddf230ce32c13cf8ffbddeaaf47cac2350a7b4 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 20 Apr 2018 17:53:55 +0100
Subject: removed horrible getter & instead prefer the state the state now gets
 updated whenever a file is changed/discard

---
 app/assets/javascripts/ide/components/repo_file.vue        | 10 +++-------
 app/assets/javascripts/ide/stores/actions/file.js          | 14 +++++++++++++-
 app/assets/javascripts/ide/stores/actions/tree.js          | 10 ++++++++++
 app/assets/javascripts/ide/stores/getters.js               | 11 -----------
 app/assets/javascripts/ide/stores/mutation_types.js        |  1 +
 app/assets/javascripts/ide/stores/mutations/tree.js        |  5 +++++
 app/assets/javascripts/ide/stores/utils.js                 |  4 ++++
 .../ide/stores/workers/files_decorator_worker.js           |  2 ++
 8 files changed, 38 insertions(+), 19 deletions(-)

(limited to 'app/assets')

diff --git a/app/assets/javascripts/ide/components/repo_file.vue b/app/assets/javascripts/ide/components/repo_file.vue
index 4199fcd7a95..36ffc1b1b78 100644
--- a/app/assets/javascripts/ide/components/repo_file.vue
+++ b/app/assets/javascripts/ide/components/repo_file.vue
@@ -1,5 +1,5 @@
 <script>
-import { mapActions, mapGetters } from 'vuex';
+import { mapActions } from 'vuex';
 import SkeletonLoadingContainer from '~/vue_shared/components/skeleton_loading_container.vue';
 import Icon from '~/vue_shared/components/icon.vue';
 import FileIcon from '~/vue_shared/components/file_icon.vue';
@@ -31,10 +31,6 @@ export default {
     },
   },
   computed: {
-    ...mapGetters(['getChangesInFolder']),
-    folderChangedCount() {
-      return this.getChangesInFolder(this.file.path);
-    },
     isTree() {
       return this.file.type === 'tree';
     },
@@ -108,10 +104,10 @@ export default {
             v-if="file.mrChange"
           />
           <span
-            v-if="isTree && folderChangedCount > 0"
+            v-if="isTree && file.changesCount > 0"
             class="ide-tree-changes"
           >
-            {{ folderChangedCount }}
+            {{ file.changesCount }}
             <icon
               name="file-modified"
               :size="12"
diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js
index d782e0a84d2..1ec5b8036b3 100644
--- a/app/assets/javascripts/ide/stores/actions/file.js
+++ b/app/assets/javascripts/ide/stores/actions/file.js
@@ -117,16 +117,24 @@ export const getRawFileData = ({ state, commit, dispatch }, { path, baseSha }) =
   });
 };
 
-export const changeFileContent = ({ state, commit }, { path, content }) => {
+export const changeFileContent = ({ state, commit, dispatch, getters }, { path, content }) => {
   const file = state.entries[path];
+  const stagedFile = getters.getStagedFile(path);
   commit(types.UPDATE_FILE_CONTENT, { path, content });
 
   const indexOfChangedFile = state.changedFiles.findIndex(f => f.path === path);
 
   if (file.changed && indexOfChangedFile === -1) {
     commit(types.ADD_FILE_TO_CHANGED, path);
+
+    if (!stagedFile) {
+      dispatch('updateChangesCount', { path, count: +1 });
+    }
   } else if (!file.changed && indexOfChangedFile !== -1) {
     commit(types.REMOVE_FILE_FROM_CHANGED, path);
+    if (!stagedFile) {
+      dispatch('updateChangesCount', { path, count: -1 });
+    }
   }
 };
 
@@ -162,6 +170,10 @@ export const discardFileChanges = ({ dispatch, state, commit, getters }, path) =
   commit(types.DISCARD_FILE_CHANGES, path);
   commit(types.REMOVE_FILE_FROM_CHANGED, path);
 
+  if (!getters.getStagedFile(path)) {
+    dispatch('updateChangesCount', { path, count: -1 });
+  }
+
   if (file.tempFile && file.opened) {
     commit(types.TOGGLE_FILE_OPEN, path);
   } else if (getters.activeFile && file.path === getters.activeFile.path) {
diff --git a/app/assets/javascripts/ide/stores/actions/tree.js b/app/assets/javascripts/ide/stores/actions/tree.js
index 6536be04f0a..240f4d46c5a 100644
--- a/app/assets/javascripts/ide/stores/actions/tree.js
+++ b/app/assets/javascripts/ide/stores/actions/tree.js
@@ -93,3 +93,13 @@ export const getFiles = ({ state, commit, dispatch }, { projectId, branchId } =
       resolve();
     }
   });
+
+export const updateChangesCount = ({ commit, dispatch, state }, { path, count }) => {
+  commit(types.UPDATE_FOLDER_CHANGE_COUNT, { path, count });
+
+  const parentPath = state.entries[path].parentPath;
+
+  if (parentPath) {
+    dispatch('updateChangesCount', { path: parentPath, count });
+  }
+};
diff --git a/app/assets/javascripts/ide/stores/getters.js b/app/assets/javascripts/ide/stores/getters.js
index 2e4129bcd48..8518d2f6f06 100644
--- a/app/assets/javascripts/ide/stores/getters.js
+++ b/app/assets/javascripts/ide/stores/getters.js
@@ -42,15 +42,4 @@ export const collapseButtonTooltip = state =>
 
 export const hasMergeRequest = state => !!state.currentMergeRequestId;
 
-export const getChangesInFolder = (state, getters) => path => {
-  const filePathMatches = f => f.path.replace(new RegExp(`/${f.name}$`), '').indexOf(path) === 0;
-  const changedFilesCount = state.changedFiles.filter(f => filePathMatches(f)).length;
-  const stagedFilesCount = state.stagedFiles.filter(
-    f => filePathMatches(f) && !getters.getChangedFile(f.path),
-  ).length;
-
-  return changedFilesCount + stagedFilesCount;
-};
-
-export const getChangedFile = state => path => state.stagedFiles.find(f => f.path === path);
 export const getStagedFile = state => path => state.stagedFiles.find(f => f.path === path);
diff --git a/app/assets/javascripts/ide/stores/mutation_types.js b/app/assets/javascripts/ide/stores/mutation_types.js
index f5f95b755c8..bf4fbca4031 100644
--- a/app/assets/javascripts/ide/stores/mutation_types.js
+++ b/app/assets/javascripts/ide/stores/mutation_types.js
@@ -28,6 +28,7 @@ export const TOGGLE_TREE_OPEN = 'TOGGLE_TREE_OPEN';
 export const SET_LAST_COMMIT_URL = 'SET_LAST_COMMIT_URL';
 export const CREATE_TREE = 'CREATE_TREE';
 export const REMOVE_ALL_CHANGES_FILES = 'REMOVE_ALL_CHANGES_FILES';
+export const UPDATE_FOLDER_CHANGE_COUNT = 'UPDATE_FOLDER_CHANGE_COUNT';
 
 // File mutation types
 export const SET_FILE_DATA = 'SET_FILE_DATA';
diff --git a/app/assets/javascripts/ide/stores/mutations/tree.js b/app/assets/javascripts/ide/stores/mutations/tree.js
index 1176c040fb9..d8cf950a783 100644
--- a/app/assets/javascripts/ide/stores/mutations/tree.js
+++ b/app/assets/javascripts/ide/stores/mutations/tree.js
@@ -31,4 +31,9 @@ export default {
       changedFiles: [],
     });
   },
+  [types.UPDATE_FOLDER_CHANGE_COUNT](state, { path, count }) {
+    Object.assign(state.entries[path], {
+      changesCount: state.entries[path].changesCount + count,
+    });
+  },
 };
diff --git a/app/assets/javascripts/ide/stores/utils.js b/app/assets/javascripts/ide/stores/utils.js
index 8a222da14c0..8eae94b7668 100644
--- a/app/assets/javascripts/ide/stores/utils.js
+++ b/app/assets/javascripts/ide/stores/utils.js
@@ -42,6 +42,8 @@ export const dataStructure = () => ({
   viewMode: 'edit',
   previewMode: null,
   size: 0,
+  parentPath: null,
+  changesCount: 0,
 });
 
 export const decorateData = entity => {
@@ -64,6 +66,7 @@ export const decorateData = entity => {
     previewMode,
     file_lock,
     html,
+    parentPath = '',
   } = entity;
 
   return {
@@ -87,6 +90,7 @@ export const decorateData = entity => {
     previewMode,
     file_lock,
     html,
+    parentPath,
   };
 };
 
diff --git a/app/assets/javascripts/ide/stores/workers/files_decorator_worker.js b/app/assets/javascripts/ide/stores/workers/files_decorator_worker.js
index a1673276900..44067f53928 100644
--- a/app/assets/javascripts/ide/stores/workers/files_decorator_worker.js
+++ b/app/assets/javascripts/ide/stores/workers/files_decorator_worker.js
@@ -26,6 +26,7 @@ self.addEventListener('message', e => {
             url: `/${projectId}/tree/${branchId}/${folderPath}/`,
             type: 'tree',
             parentTreeUrl: parentFolder ? parentFolder.url : `/${projectId}/tree/${branchId}/`,
+            parentPath: parentFolder ? parentFolder.path : null,
             tempFile,
             changed: tempFile,
             opened: tempFile,
@@ -61,6 +62,7 @@ self.addEventListener('message', e => {
         url: `/${projectId}/blob/${branchId}/${path}`,
         type: 'blob',
         parentTreeUrl: fileFolder ? fileFolder.url : `/${projectId}/blob/${branchId}`,
+        parentPath: fileFolder ? fileFolder.path : null,
         tempFile,
         changed: tempFile,
         content,
-- 
cgit v1.2.1


From 8d29dd960c1ba8f2f40a1f37cbc937afcbfc291c Mon Sep 17 00:00:00 2001
From: George Tsiolis <tsiolis.g@gmail.com>
Date: Sat, 28 Apr 2018 02:26:00 +0300
Subject: Add loading icon padding for pipeline environments

---
 app/assets/javascripts/environments/components/container.vue | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/assets')

diff --git a/app/assets/javascripts/environments/components/container.vue b/app/assets/javascripts/environments/components/container.vue
index dbee81fa320..6bd7c6b49cb 100644
--- a/app/assets/javascripts/environments/components/container.vue
+++ b/app/assets/javascripts/environments/components/container.vue
@@ -43,6 +43,7 @@
   <div class="environments-container">
 
     <loading-icon
+      class="prepend-top-default"
       label="Loading environments"
       v-if="isLoading"
       size="3"
-- 
cgit v1.2.1


From 87eb66e7b3823ed02f98d9d844717fedc06325d9 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 30 Apr 2018 09:49:51 +0100
Subject: removed conflict markers

---
 app/assets/stylesheets/pages/repo.scss | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'app/assets')

diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index 2077cb5ea8d..dfdeaf34d02 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -68,8 +68,6 @@
       }
     }
 
-<<<<<<< HEAD
-=======
     .ide-file-icon-holder {
       display: flex;
       align-items: center;
@@ -83,7 +81,6 @@
       }
     }
 
->>>>>>> master
     .ide-new-btn {
       display: none;
       margin-right: -8px;
-- 
cgit v1.2.1


From bec24d15813388440d172cf4f27d936130202a09 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 1 May 2018 09:29:08 +0100
Subject: use getters to correctly get the counts for both unstaged & staged
 changes

---
 .../javascripts/ide/components/repo_file.vue       | 43 ++++++++++++++++++++--
 app/assets/javascripts/ide/stores/actions/file.js  | 11 ------
 app/assets/javascripts/ide/stores/actions/tree.js  | 10 -----
 app/assets/javascripts/ide/stores/getters.js       | 25 +++++++++++++
 .../javascripts/ide/stores/mutation_types.js       |  1 -
 .../javascripts/ide/stores/mutations/tree.js       |  5 ---
 app/assets/javascripts/ide/stores/utils.js         |  2 -
 7 files changed, 65 insertions(+), 32 deletions(-)

(limited to 'app/assets')

diff --git a/app/assets/javascripts/ide/components/repo_file.vue b/app/assets/javascripts/ide/components/repo_file.vue
index 0b54d621fe9..51534ca321a 100644
--- a/app/assets/javascripts/ide/components/repo_file.vue
+++ b/app/assets/javascripts/ide/components/repo_file.vue
@@ -1,5 +1,7 @@
 <script>
-import { mapActions } from 'vuex';
+import { mapActions, mapGetters } from 'vuex';
+import { n__, __, sprintf } from '~/locale';
+import tooltip from '~/vue_shared/directives/tooltip';
 import SkeletonLoadingContainer from '~/vue_shared/components/skeleton_loading_container.vue';
 import Icon from '~/vue_shared/components/icon.vue';
 import FileIcon from '~/vue_shared/components/file_icon.vue';
@@ -11,6 +13,9 @@ import MrFileIcon from './mr_file_icon.vue';
 
 export default {
   name: 'RepoFile',
+  directives: {
+    tooltip,
+  },
   components: {
     SkeletonLoadingContainer,
     NewDropdown,
@@ -31,6 +36,34 @@ export default {
     },
   },
   computed: {
+    ...mapGetters([
+      'getChangesInFolder',
+      'getUnstagedFilesCountForPath',
+      'getStagedFilesCountForPath',
+    ]),
+    folderUnstagedCount() {
+      return this.getUnstagedFilesCountForPath(this.file.path);
+    },
+    folderStagedCount() {
+      return this.getStagedFilesCountForPath(this.file.path);
+    },
+    changesCount() {
+      return this.getChangesInFolder(this.file.path);
+    },
+    folderChangesTooltip() {
+      if (this.changesCount === 0) return undefined;
+
+      if (this.folderUnstagedCount > 0 && this.folderStagedCount === 0) {
+        return n__('%d unstaged change', '%d unstaged changes', this.folderUnstagedCount);
+      } else if (this.folderUnstagedCount === 0 && this.folderStagedCount > 0) {
+        return n__('%d staged change', '%d staged changes', this.folderStagedCount);
+      }
+
+      return sprintf(__('%{unstaged} unstaged and %{staged} staged changes'), {
+        unstaged: this.folderUnstagedCount,
+        staged: this.folderStagedCount,
+      });
+    },
     isTree() {
       return this.file.type === 'tree';
     },
@@ -104,11 +137,15 @@ export default {
             v-if="file.mrChange"
           />
           <span
-            v-if="isTree && file.changesCount > 0"
+            v-if="isTree && changesCount > 0 && !file.opened"
             class="ide-tree-changes"
           >
-            {{ file.changesCount }}
+            {{ changesCount }}
             <icon
+              v-tooltip
+              :title="folderChangesTooltip"
+              data-container="body"
+              data-placement="right"
               name="file-modified"
               :size="12"
               css-classes="prepend-left-5 multi-file-modified"
diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js
index 288cb66515c..10c48e0a359 100644
--- a/app/assets/javascripts/ide/stores/actions/file.js
+++ b/app/assets/javascripts/ide/stores/actions/file.js
@@ -126,15 +126,8 @@ export const changeFileContent = ({ state, commit, dispatch, getters }, { path,
 
   if (file.changed && indexOfChangedFile === -1) {
     commit(types.ADD_FILE_TO_CHANGED, path);
-
-    if (!stagedFile) {
-      dispatch('updateChangesCount', { path, count: +1 });
-    }
   } else if (!file.changed && indexOfChangedFile !== -1) {
     commit(types.REMOVE_FILE_FROM_CHANGED, path);
-    if (!stagedFile) {
-      dispatch('updateChangesCount', { path, count: -1 });
-    }
   }
 };
 
@@ -170,10 +163,6 @@ export const discardFileChanges = ({ dispatch, state, commit, getters }, path) =
   commit(types.DISCARD_FILE_CHANGES, path);
   commit(types.REMOVE_FILE_FROM_CHANGED, path);
 
-  if (!getters.getStagedFile(path)) {
-    dispatch('updateChangesCount', { path, count: -1 });
-  }
-
   if (file.tempFile && file.opened) {
     commit(types.TOGGLE_FILE_OPEN, path);
   } else if (getters.activeFile && file.path === getters.activeFile.path) {
diff --git a/app/assets/javascripts/ide/stores/actions/tree.js b/app/assets/javascripts/ide/stores/actions/tree.js
index 240f4d46c5a..6536be04f0a 100644
--- a/app/assets/javascripts/ide/stores/actions/tree.js
+++ b/app/assets/javascripts/ide/stores/actions/tree.js
@@ -93,13 +93,3 @@ export const getFiles = ({ state, commit, dispatch }, { projectId, branchId } =
       resolve();
     }
   });
-
-export const updateChangesCount = ({ commit, dispatch, state }, { path, count }) => {
-  commit(types.UPDATE_FOLDER_CHANGE_COUNT, { path, count });
-
-  const parentPath = state.entries[path].parentPath;
-
-  if (parentPath) {
-    dispatch('updateChangesCount', { path: parentPath, count });
-  }
-};
diff --git a/app/assets/javascripts/ide/stores/getters.js b/app/assets/javascripts/ide/stores/getters.js
index ec1ea155aee..d316d5571ff 100644
--- a/app/assets/javascripts/ide/stores/getters.js
+++ b/app/assets/javascripts/ide/stores/getters.js
@@ -55,7 +55,32 @@ export const allBlobs = state =>
     }, [])
     .sort((a, b) => b.lastOpenedAt - a.lastOpenedAt);
 
+export const getChangedFile = state => path => state.changedFiles.find(f => f.path === path);
 export const getStagedFile = state => path => state.stagedFiles.find(f => f.path === path);
 
+export const getChangesInFolder = state => path => {
+  const filePathMatches = f => f.path.replace(new RegExp(`/${f.name}$`), '').indexOf(path) === 0;
+  const changedFilesCount = state.changedFiles.filter(f => filePathMatches(f)).length;
+  const stagedFilesCount = state.stagedFiles.filter(
+    f => filePathMatches(f) && !getChangedFile(state, f.path),
+  ).length;
+
+  return changedFilesCount + stagedFilesCount;
+};
+
+export const getUnstagedFilesCountForPath = state => path => {
+  const filePathMatches = f => f.path.replace(new RegExp(`/${f.name}$`), '').indexOf(path) === 0;
+  const changedFilesCount = state.changedFiles.filter(f => filePathMatches(f)).length;
+
+  return changedFilesCount;
+};
+
+export const getStagedFilesCountForPath = state => path => {
+  const filePathMatches = f => f.path.replace(new RegExp(`/${f.name}$`), '').indexOf(path) === 0;
+  const stagedFilesCount = state.stagedFiles.filter(f => filePathMatches(f)).length;
+
+  return stagedFilesCount;
+};
+
 // prevent babel-plugin-rewire from generating an invalid default during karma tests
 export default () => {};
diff --git a/app/assets/javascripts/ide/stores/mutation_types.js b/app/assets/javascripts/ide/stores/mutation_types.js
index ae48035a291..f5c12db6db0 100644
--- a/app/assets/javascripts/ide/stores/mutation_types.js
+++ b/app/assets/javascripts/ide/stores/mutation_types.js
@@ -28,7 +28,6 @@ export const TOGGLE_TREE_OPEN = 'TOGGLE_TREE_OPEN';
 export const SET_LAST_COMMIT_URL = 'SET_LAST_COMMIT_URL';
 export const CREATE_TREE = 'CREATE_TREE';
 export const REMOVE_ALL_CHANGES_FILES = 'REMOVE_ALL_CHANGES_FILES';
-export const UPDATE_FOLDER_CHANGE_COUNT = 'UPDATE_FOLDER_CHANGE_COUNT';
 
 // File mutation types
 export const SET_FILE_DATA = 'SET_FILE_DATA';
diff --git a/app/assets/javascripts/ide/stores/mutations/tree.js b/app/assets/javascripts/ide/stores/mutations/tree.js
index d8cf950a783..1176c040fb9 100644
--- a/app/assets/javascripts/ide/stores/mutations/tree.js
+++ b/app/assets/javascripts/ide/stores/mutations/tree.js
@@ -31,9 +31,4 @@ export default {
       changedFiles: [],
     });
   },
-  [types.UPDATE_FOLDER_CHANGE_COUNT](state, { path, count }) {
-    Object.assign(state.entries[path], {
-      changesCount: state.entries[path].changesCount + count,
-    });
-  },
 };
diff --git a/app/assets/javascripts/ide/stores/utils.js b/app/assets/javascripts/ide/stores/utils.js
index 74f77bf678d..67d013fe3c4 100644
--- a/app/assets/javascripts/ide/stores/utils.js
+++ b/app/assets/javascripts/ide/stores/utils.js
@@ -33,7 +33,6 @@ export const dataStructure = () => ({
   raw: '',
   content: '',
   parentTreeUrl: '',
-  parentPath: '',
   renderError: false,
   base64: false,
   editorRow: 1,
@@ -44,7 +43,6 @@ export const dataStructure = () => ({
   previewMode: null,
   size: 0,
   parentPath: null,
-  changesCount: 0,
   lastOpenedAt: 0,
 });
 
-- 
cgit v1.2.1


From f55f199767ae9e7a3dc06341a4704ef000f359ae Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 1 May 2018 10:13:07 +0100
Subject: fixed eslint

---
 app/assets/javascripts/ide/stores/actions/file.js                   | 1 -
 app/assets/javascripts/ide/stores/utils.js                          | 1 -
 app/assets/javascripts/ide/stores/workers/files_decorator_worker.js | 2 --
 3 files changed, 4 deletions(-)

(limited to 'app/assets')

diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js
index 10c48e0a359..6cee19b83b8 100644
--- a/app/assets/javascripts/ide/stores/actions/file.js
+++ b/app/assets/javascripts/ide/stores/actions/file.js
@@ -119,7 +119,6 @@ export const getRawFileData = ({ state, commit, dispatch }, { path, baseSha }) =
 
 export const changeFileContent = ({ state, commit, dispatch, getters }, { path, content }) => {
   const file = state.entries[path];
-  const stagedFile = getters.getStagedFile(path);
   commit(types.UPDATE_FILE_CONTENT, { path, content });
 
   const indexOfChangedFile = state.changedFiles.findIndex(f => f.path === path);
diff --git a/app/assets/javascripts/ide/stores/utils.js b/app/assets/javascripts/ide/stores/utils.js
index 67d013fe3c4..e9ae11ca30e 100644
--- a/app/assets/javascripts/ide/stores/utils.js
+++ b/app/assets/javascripts/ide/stores/utils.js
@@ -83,7 +83,6 @@ export const decorateData = entity => {
     opened,
     active,
     parentTreeUrl,
-    parentPath,
     changed,
     renderError,
     content,
diff --git a/app/assets/javascripts/ide/stores/workers/files_decorator_worker.js b/app/assets/javascripts/ide/stores/workers/files_decorator_worker.js
index abb4ba94a66..d249b05f47c 100644
--- a/app/assets/javascripts/ide/stores/workers/files_decorator_worker.js
+++ b/app/assets/javascripts/ide/stores/workers/files_decorator_worker.js
@@ -29,7 +29,6 @@ self.addEventListener('message', e => {
             url: `/${projectId}/tree/${branchId}/${folderPath}/`,
             type: 'tree',
             parentTreeUrl: parentFolder ? parentFolder.url : `/${projectId}/tree/${branchId}/`,
-            parentPath: parentFolder ? parentFolder.path : null,
             tempFile,
             changed: tempFile,
             opened: tempFile,
@@ -68,7 +67,6 @@ self.addEventListener('message', e => {
         url: `/${projectId}/blob/${branchId}/${path}`,
         type: 'blob',
         parentTreeUrl: fileFolder ? fileFolder.url : `/${projectId}/blob/${branchId}`,
-        parentPath: fileFolder ? fileFolder.path : null,
         tempFile,
         changed: tempFile,
         content,
-- 
cgit v1.2.1


From 55b91d94415e0323ec7b2ff63df3f73d532b6971 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 1 May 2018 14:18:23 +0100
Subject: fixed staged files not being recognised reduced code duplication

---
 app/assets/javascripts/ide/stores/getters.js | 22 +++++++---------------
 app/assets/javascripts/ide/stores/utils.js   |  6 ++++++
 2 files changed, 13 insertions(+), 15 deletions(-)

(limited to 'app/assets')

diff --git a/app/assets/javascripts/ide/stores/getters.js b/app/assets/javascripts/ide/stores/getters.js
index d316d5571ff..212974c00fe 100644
--- a/app/assets/javascripts/ide/stores/getters.js
+++ b/app/assets/javascripts/ide/stores/getters.js
@@ -1,4 +1,5 @@
 import { __ } from '~/locale';
+import { getChangesCountForState, filePathMatches } from './utils';
 
 export const activeFile = state => state.openFiles.find(file => file.active) || null;
 
@@ -59,28 +60,19 @@ export const getChangedFile = state => path => state.changedFiles.find(f => f.pa
 export const getStagedFile = state => path => state.stagedFiles.find(f => f.path === path);
 
 export const getChangesInFolder = state => path => {
-  const filePathMatches = f => f.path.replace(new RegExp(`/${f.name}$`), '').indexOf(path) === 0;
-  const changedFilesCount = state.changedFiles.filter(f => filePathMatches(f)).length;
+  const changedFilesCount = state.changedFiles.filter(f => filePathMatches(f, path)).length;
   const stagedFilesCount = state.stagedFiles.filter(
-    f => filePathMatches(f) && !getChangedFile(state, f.path),
+    f => filePathMatches(f, path) && !getChangedFile(state)(f.path),
   ).length;
 
   return changedFilesCount + stagedFilesCount;
 };
 
-export const getUnstagedFilesCountForPath = state => path => {
-  const filePathMatches = f => f.path.replace(new RegExp(`/${f.name}$`), '').indexOf(path) === 0;
-  const changedFilesCount = state.changedFiles.filter(f => filePathMatches(f)).length;
+export const getUnstagedFilesCountForPath = state => path =>
+  getChangesCountForState(state.changesFiles, path);
 
-  return changedFilesCount;
-};
-
-export const getStagedFilesCountForPath = state => path => {
-  const filePathMatches = f => f.path.replace(new RegExp(`/${f.name}$`), '').indexOf(path) === 0;
-  const stagedFilesCount = state.stagedFiles.filter(f => filePathMatches(f)).length;
-
-  return stagedFilesCount;
-};
+export const getStagedFilesCountForPath = state => path =>
+  getChangesCountForState(state.stagedFiles, path);
 
 // prevent babel-plugin-rewire from generating an invalid default during karma tests
 export default () => {};
diff --git a/app/assets/javascripts/ide/stores/utils.js b/app/assets/javascripts/ide/stores/utils.js
index e9ae11ca30e..1c433a87577 100644
--- a/app/assets/javascripts/ide/stores/utils.js
+++ b/app/assets/javascripts/ide/stores/utils.js
@@ -137,3 +137,9 @@ export const sortTree = sortedTree =>
       }),
     )
     .sort(sortTreesByTypeAndName);
+
+export const filePathMatches = (f, path) =>
+  f.path.replace(new RegExp(`${f.name}$`), '').indexOf(`${path}/`) === 0;
+
+export const getChangesCountForState = (state, path) =>
+  state.stagedFiles.filter(f => filePathMatches(f, path)).length;
-- 
cgit v1.2.1


From 5d90c7065a1fc8aa147c93d2ff0944d58bcc1fbd Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 1 May 2018 15:09:07 +0100
Subject: fixed getters

---
 app/assets/javascripts/ide/stores/getters.js | 6 +++---
 app/assets/javascripts/ide/stores/utils.js   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/assets')

diff --git a/app/assets/javascripts/ide/stores/getters.js b/app/assets/javascripts/ide/stores/getters.js
index 212974c00fe..a93d29fd865 100644
--- a/app/assets/javascripts/ide/stores/getters.js
+++ b/app/assets/javascripts/ide/stores/getters.js
@@ -1,5 +1,5 @@
 import { __ } from '~/locale';
-import { getChangesCountForState, filePathMatches } from './utils';
+import { getChangesCountForFiles, filePathMatches } from './utils';
 
 export const activeFile = state => state.openFiles.find(file => file.active) || null;
 
@@ -69,10 +69,10 @@ export const getChangesInFolder = state => path => {
 };
 
 export const getUnstagedFilesCountForPath = state => path =>
-  getChangesCountForState(state.changesFiles, path);
+  getChangesCountForFiles(state.changedFiles, path);
 
 export const getStagedFilesCountForPath = state => path =>
-  getChangesCountForState(state.stagedFiles, path);
+  getChangesCountForFiles(state.stagedFiles, path);
 
 // prevent babel-plugin-rewire from generating an invalid default during karma tests
 export default () => {};
diff --git a/app/assets/javascripts/ide/stores/utils.js b/app/assets/javascripts/ide/stores/utils.js
index 1c433a87577..bc79ff4a542 100644
--- a/app/assets/javascripts/ide/stores/utils.js
+++ b/app/assets/javascripts/ide/stores/utils.js
@@ -141,5 +141,5 @@ export const sortTree = sortedTree =>
 export const filePathMatches = (f, path) =>
   f.path.replace(new RegExp(`${f.name}$`), '').indexOf(`${path}/`) === 0;
 
-export const getChangesCountForState = (state, path) =>
-  state.stagedFiles.filter(f => filePathMatches(f, path)).length;
+export const getChangesCountForFiles = (files, path) =>
+  files.filter(f => filePathMatches(f, path)).length;
-- 
cgit v1.2.1


From 6f1dd7853d0af7560ed348f185a1794288223ca6 Mon Sep 17 00:00:00 2001
From: George Tsiolis <tsiolis.g@gmail.com>
Date: Tue, 1 May 2018 23:11:32 +0300
Subject: Break issue title for board card title and issuable header text

---
 app/assets/stylesheets/pages/boards.scss | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/assets')

diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss
index 318d3ddaece..681242f8d85 100644
--- a/app/assets/stylesheets/pages/boards.scss
+++ b/app/assets/stylesheets/pages/boards.scss
@@ -317,6 +317,7 @@
   a {
     color: $gl-text-color;
     word-wrap: break-word;
+    word-break: break-word;
     margin-right: 2px;
   }
 }
@@ -462,6 +463,7 @@
 
   .issuable-header-text {
     padding-right: 35px;
+    word-break: break-word;
 
     > strong {
       font-weight: $gl-font-weight-bold;
-- 
cgit v1.2.1


From b8bda4ce109db177bbea798bb5837e38e0ff31a0 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 2 May 2018 09:53:31 +0100
Subject: scroll active item into view with animation

---
 app/assets/javascripts/ide/components/repo_file.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'app/assets')

diff --git a/app/assets/javascripts/ide/components/repo_file.vue b/app/assets/javascripts/ide/components/repo_file.vue
index 51534ca321a..63ca8c3ab89 100644
--- a/app/assets/javascripts/ide/components/repo_file.vue
+++ b/app/assets/javascripts/ide/components/repo_file.vue
@@ -86,7 +86,10 @@ export default {
   },
   updated() {
     if (this.file.type === 'blob' && this.file.active) {
-      this.$el.scrollIntoView();
+      this.$el.scrollIntoView({
+        behavior: 'smooth',
+        block: 'nearest',
+      });
     }
   },
   methods: {
-- 
cgit v1.2.1


From b91d400ee0c1fc10f20f9f1e909b01d0a4082ed4 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 2 May 2018 15:05:15 +0100
Subject: created computed props removed unused parameters

---
 app/assets/javascripts/ide/components/repo_file.vue | 10 ++++++++--
 app/assets/javascripts/ide/stores/actions/file.js   |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'app/assets')

diff --git a/app/assets/javascripts/ide/components/repo_file.vue b/app/assets/javascripts/ide/components/repo_file.vue
index 63ca8c3ab89..89c5ce70dd3 100644
--- a/app/assets/javascripts/ide/components/repo_file.vue
+++ b/app/assets/javascripts/ide/components/repo_file.vue
@@ -83,6 +83,12 @@ export default {
         'is-open': this.file.opened,
       };
     },
+    showTreeChangesCount() {
+      return this.isTree && this.changesCount > 0 && !this.file.opened;
+    },
+    showChangedFileIcon() {
+      return this.file.changed || this.file.tempFile || this.file.staged;
+    },
   },
   updated() {
     if (this.file.type === 'blob' && this.file.active) {
@@ -140,7 +146,7 @@ export default {
             v-if="file.mrChange"
           />
           <span
-            v-if="isTree && changesCount > 0 && !file.opened"
+            v-if="showTreeChangesCount"
             class="ide-tree-changes"
           >
             {{ changesCount }}
@@ -155,7 +161,7 @@ export default {
             />
           </span>
           <changed-file-icon
-            v-else-if="file.changed || file.tempFile || file.staged"
+            v-else-if="showChangedFileIcon"
             :file="file"
             :show-tooltip="true"
             :show-staged-icon="true"
diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js
index 6cee19b83b8..fcdb3b753b2 100644
--- a/app/assets/javascripts/ide/stores/actions/file.js
+++ b/app/assets/javascripts/ide/stores/actions/file.js
@@ -117,7 +117,7 @@ export const getRawFileData = ({ state, commit, dispatch }, { path, baseSha }) =
   });
 };
 
-export const changeFileContent = ({ state, commit, dispatch, getters }, { path, content }) => {
+export const changeFileContent = ({ state, commit }, { path, content }) => {
   const file = state.entries[path];
   commit(types.UPDATE_FILE_CONTENT, { path, content });
 
-- 
cgit v1.2.1


From 467623aa6903dbf3b89bad0008d1e46fe032a541 Mon Sep 17 00:00:00 2001
From: George Tsiolis <tsiolis.g@gmail.com>
Date: Thu, 3 May 2018 13:21:07 +0300
Subject: Move TimeTrackingSpentOnlyPane vue component

---
 .../components/time_tracking/spent_only_pane.js        | 15 ---------------
 .../components/time_tracking/spent_only_pane.vue       | 18 ++++++++++++++++++
 .../sidebar/components/time_tracking/time_tracker.vue  |  4 ++--
 3 files changed, 20 insertions(+), 17 deletions(-)
 delete mode 100644 app/assets/javascripts/sidebar/components/time_tracking/spent_only_pane.js
 create mode 100644 app/assets/javascripts/sidebar/components/time_tracking/spent_only_pane.vue

(limited to 'app/assets')

diff --git a/app/assets/javascripts/sidebar/components/time_tracking/spent_only_pane.js b/app/assets/javascripts/sidebar/components/time_tracking/spent_only_pane.js
deleted file mode 100644
index bf987562647..00000000000
--- a/app/assets/javascripts/sidebar/components/time_tracking/spent_only_pane.js
+++ /dev/null
@@ -1,15 +0,0 @@
-export default {
-  name: 'time-tracking-spent-only-pane',
-  props: {
-    timeSpentHumanReadable: {
-      type: String,
-      required: true,
-    },
-  },
-  template: `
-    <div class="time-tracking-spend-only-pane">
-      <span class="bold">Spent:</span>
-      {{ timeSpentHumanReadable }}
-    </div>
-  `,
-};
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/spent_only_pane.vue b/app/assets/javascripts/sidebar/components/time_tracking/spent_only_pane.vue
new file mode 100644
index 00000000000..59cd99f8f14
--- /dev/null
+++ b/app/assets/javascripts/sidebar/components/time_tracking/spent_only_pane.vue
@@ -0,0 +1,18 @@
+<script>
+export default {
+  name: 'TimeTrackingSpentOnlyPane',
+  props: {
+    timeSpentHumanReadable: {
+      type: String,
+      required: true,
+    },
+  },
+};
+</script>
+
+<template>
+  <div class="time-tracking-spend-only-pane">
+    <span class="bold">Spent:</span>
+    {{ timeSpentHumanReadable }}
+  </div>
+</template>
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
index 9c003aa9f8a..8f5d0bee107 100644
--- a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
@@ -1,7 +1,7 @@
 <script>
 import TimeTrackingHelpState from './help_state.vue';
 import TimeTrackingCollapsedState from './collapsed_state.vue';
-import timeTrackingSpentOnlyPane from './spent_only_pane';
+import TimeTrackingSpentOnlyPane from './spent_only_pane.vue';
 import TimeTrackingNoTrackingPane from './no_tracking_pane.vue';
 import TimeTrackingEstimateOnlyPane from './estimate_only_pane.vue';
 import TimeTrackingComparisonPane from './comparison_pane.vue';
@@ -13,7 +13,7 @@ export default {
   components: {
     TimeTrackingCollapsedState,
     TimeTrackingEstimateOnlyPane,
-    'time-tracking-spent-only-pane': timeTrackingSpentOnlyPane,
+    TimeTrackingSpentOnlyPane,
     TimeTrackingNoTrackingPane,
     TimeTrackingComparisonPane,
     TimeTrackingHelpState,
-- 
cgit v1.2.1


From d2665707c04594a6cea22ebb3b4d89a0577d02c5 Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Thu, 3 May 2018 13:01:52 +0530
Subject: Emit `toggleSubscription`, `toggleSidebar` events on component

---
 .../components/subscriptions/subscriptions.vue     | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'app/assets')

diff --git a/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue b/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue
index d69d100a26c..f0df759ef7a 100644
--- a/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue
+++ b/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue
@@ -47,8 +47,25 @@
       },
     },
     methods: {
+      /**
+       * We need to emit this event on both component & eventHub
+       * for 2 dependencies;
+       *
+       * 1. eventHub: This component is used in Issue Boards sidebar
+       *              where component template is part of HAML
+       *              and event listeners are tied to app's eventHub.
+       * 2. Component: This compone is also used in Epics in EE
+       *               where listeners are tied to component event.
+       */
       toggleSubscription() {
+        // App's eventHub event emission.
         eventHub.$emit('toggleSubscription', this.id);
+
+        // Component event emission.
+        this.$emit('toggleSubscription', this.id);
+      },
+      onClickCollapsedIcon() {
+        this.$emit('toggleSidebar');
       },
     },
   };
@@ -56,7 +73,10 @@
 
 <template>
   <div>
-    <div class="sidebar-collapsed-icon">
+    <div
+      class="sidebar-collapsed-icon"
+      @click="onClickCollapsedIcon"
+    >
       <span
         v-tooltip
         :title="notificationTooltip"
-- 
cgit v1.2.1


From 342fbbdaa2f7bdf2ac9cecdbcce55ae0f3f09485 Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Thu, 3 May 2018 13:02:04 +0530
Subject: Consume `toggleSubscription` event directly from Subscriptions
 component

---
 .../sidebar/components/subscriptions/sidebar_subscriptions.vue    | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'app/assets')

diff --git a/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue b/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue
index 3e8cc7a6630..385717e7c1e 100644
--- a/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue
+++ b/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue
@@ -1,6 +1,5 @@
 <script>
 import Store from '../../stores/sidebar_store';
-import eventHub from '../../event_hub';
 import Flash from '../../../flash';
 import { __ } from '../../../locale';
 import subscriptions from './subscriptions.vue';
@@ -20,12 +19,6 @@ export default {
       store: new Store(),
     };
   },
-  created() {
-    eventHub.$on('toggleSubscription', this.onToggleSubscription);
-  },
-  beforeDestroy() {
-    eventHub.$off('toggleSubscription', this.onToggleSubscription);
-  },
   methods: {
     onToggleSubscription() {
       this.mediator.toggleSubscription()
@@ -42,6 +35,7 @@ export default {
     <subscriptions
       :loading="store.isFetching.subscriptions"
       :subscribed="store.subscribed"
+      @toggleSubscription="onToggleSubscription"
     />
   </div>
 </template>
-- 
cgit v1.2.1


From e164447bf1c110f2b0df2589c4a7be1388d07151 Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Thu, 3 May 2018 15:05:17 +0530
Subject: Emit `toggleSidebar` event on component when icon is clicked

---
 .../javascripts/sidebar/components/participants/participants.vue      | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/assets')

diff --git a/app/assets/javascripts/sidebar/components/participants/participants.vue b/app/assets/javascripts/sidebar/components/participants/participants.vue
index 6d95153af28..8f9e6761d20 100644
--- a/app/assets/javascripts/sidebar/components/participants/participants.vue
+++ b/app/assets/javascripts/sidebar/components/participants/participants.vue
@@ -70,6 +70,9 @@
       toggleMoreParticipants() {
         this.isShowingMoreParticipants = !this.isShowingMoreParticipants;
       },
+      onClickCollapsedIcon() {
+        this.$emit('toggleSidebar');
+      },
     },
   };
 </script>
@@ -82,6 +85,7 @@
       data-container="body"
       data-placement="left"
       :title="participantLabel"
+      @click="onClickCollapsedIcon"
     >
       <i
         class="fa fa-users"
-- 
cgit v1.2.1