From 6438df3a1e0fb944485cebf07976160184697d72 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 20 Jan 2021 13:34:23 -0600
Subject: Add latest changes from gitlab-org/gitlab@13-8-stable-ee

---
 .../components/add_context_commits_modal_wrapper.vue       | 10 +++++-----
 .../javascripts/add_context_commits_modal/store/actions.js | 14 +++++++-------
 app/assets/javascripts/add_context_commits_modal/utils.js  |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'app/assets/javascripts/add_context_commits_modal')

diff --git a/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue b/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue
index cb9aa50fa68..c58ded3f1f5 100644
--- a/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue
+++ b/app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue
@@ -61,14 +61,14 @@ export default {
       },
     },
     selectedCommitsCount() {
-      return this.selectedCommits.filter(selectedCommit => selectedCommit.isSelected).length;
+      return this.selectedCommits.filter((selectedCommit) => selectedCommit.isSelected).length;
     },
     shouldPurge() {
       return this.selectedCommitsCount !== this.selectedCommits.length;
     },
     uniqueCommits() {
       return this.selectedCommits.filter(
-        selectedCommit =>
+        (selectedCommit) =>
           selectedCommit.isSelected &&
           findCommitIndex(this.contextCommits, selectedCommit.short_id) === -1,
       );
@@ -126,7 +126,7 @@ export default {
         this.focusSearch();
         if (this.shouldPurge) {
           this.setSelectedCommits(
-            [...this.commits, ...this.selectedCommits].filter(commit => commit.isSelected),
+            [...this.commits, ...this.selectedCommits].filter((commit) => commit.isSelected),
           );
         }
       }
@@ -178,7 +178,7 @@ export default {
       this.setCommits({ commits: tempCommits });
       this.setSelectedCommits([
         ...tempSelectedCommits,
-        ...tempCommits.filter(commit => commit.isSelected),
+        ...tempCommits.filter((commit) => commit.isSelected),
       ]);
     },
     handleCreateContextCommits() {
@@ -186,7 +186,7 @@ export default {
         return Promise.all([
           this.createContextCommits({ commits: this.uniqueCommits }),
           this.removeContextCommits(),
-        ]).then(values => {
+        ]).then((values) => {
           if (values[0] || values[1]) {
             window.location.reload();
           }
diff --git a/app/assets/javascripts/add_context_commits_modal/store/actions.js b/app/assets/javascripts/add_context_commits_modal/store/actions.js
index d23955182b2..1bf54b159ee 100644
--- a/app/assets/javascripts/add_context_commits_modal/store/actions.js
+++ b/app/assets/javascripts/add_context_commits_modal/store/actions.js
@@ -27,10 +27,10 @@ export const searchCommits = ({ dispatch, commit, state }, searchText) => {
   return axios
     .get(state.contextCommitsPath, params)
     .then(({ data }) => {
-      let commits = data.map(o => ({ ...o, isSelected: false }));
-      commits = commits.map(c => {
+      let commits = data.map((o) => ({ ...o, isSelected: false }));
+      commits = commits.map((c) => {
         const isPresent = state.selectedCommits.find(
-          selectedCommit => selectedCommit.short_id === c.short_id && selectedCommit.isSelected,
+          (selectedCommit) => selectedCommit.short_id === c.short_id && selectedCommit.isSelected,
         );
         if (isPresent) {
           return { ...c, isSelected: true };
@@ -50,7 +50,7 @@ export const searchCommits = ({ dispatch, commit, state }, searchText) => {
 
 export const setCommits = ({ commit }, { commits: data, silentAddition = false }) => {
   let commits = _.uniqBy(data, 'short_id');
-  commits = _.orderBy(data, c => new Date(c.committed_date), ['desc']);
+  commits = _.orderBy(data, (c) => new Date(c.committed_date), ['desc']);
   if (silentAddition) {
     commit(types.SET_COMMITS_SILENT, commits);
   } else {
@@ -60,7 +60,7 @@ export const setCommits = ({ commit }, { commits: data, silentAddition = false }
 
 export const createContextCommits = ({ state }, { commits, forceReload = false }) =>
   Api.createContextCommits(state.projectId, state.mergeRequestIid, {
-    commits: commits.map(commit => commit.short_id),
+    commits: commits.map((commit) => commit.short_id),
   })
     .then(() => {
       if (forceReload) {
@@ -81,7 +81,7 @@ export const fetchContextCommits = ({ dispatch, commit, state }) => {
   commit(types.FETCH_CONTEXT_COMMITS);
   return Api.allContextCommits(state.projectId, state.mergeRequestIid)
     .then(({ data }) => {
-      const contextCommits = data.map(o => ({ ...o, isSelected: true }));
+      const contextCommits = data.map((o) => ({ ...o, isSelected: true }));
       dispatch('setContextCommits', contextCommits);
       dispatch('setCommits', {
         commits: [...state.commits, ...contextCommits],
@@ -121,7 +121,7 @@ export const setSelectedCommits = ({ commit }, selected) => {
   let selectedCommits = _.uniqBy(selected, 'short_id');
   selectedCommits = _.orderBy(
     selectedCommits,
-    selectedCommit => new Date(selectedCommit.committed_date),
+    (selectedCommit) => new Date(selectedCommit.committed_date),
     ['desc'],
   );
   commit(types.SET_SELECTED_COMMITS, selectedCommits);
diff --git a/app/assets/javascripts/add_context_commits_modal/utils.js b/app/assets/javascripts/add_context_commits_modal/utils.js
index 3495ee17cd3..114913b1893 100644
--- a/app/assets/javascripts/add_context_commits_modal/utils.js
+++ b/app/assets/javascripts/add_context_commits_modal/utils.js
@@ -1,5 +1,5 @@
 export const findCommitIndex = (commits, commitShortId) => {
-  return commits.findIndex(commit => commit.short_id === commitShortId);
+  return commits.findIndex((commit) => commit.short_id === commitShortId);
 };
 
 export const setCommitStatus = (commits, commitIndex, selected) => {
-- 
cgit v1.2.3