summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/ide
diff options
context:
space:
mode:
authorPaul Slaughter <pslaughter@gitlab.com>2018-08-28 08:06:40 +0000
committerPhil Hughes <me@iamphill.com>2018-08-28 08:06:40 +0000
commit6bb08542579739ec5806a2dfe61c1f7c3c56a1f5 (patch)
treecd232638d5ac5f06073060b500403276e5d07058 /app/assets/javascripts/ide
parenta1f1460ae5eafb44c25eeb2fae5102618fafe55f (diff)
downloadgitlab-ce-6bb08542579739ec5806a2dfe61c1f7c3c56a1f5.tar.gz
Resolve "It's impossible to commit twice to the same branch"
Diffstat (limited to 'app/assets/javascripts/ide')
-rw-r--r--app/assets/javascripts/ide/stores/mutations.js8
1 files changed, 1 insertions, 7 deletions
diff --git a/app/assets/javascripts/ide/stores/mutations.js b/app/assets/javascripts/ide/stores/mutations.js
index 56a8d9430c7..0347f803757 100644
--- a/app/assets/javascripts/ide/stores/mutations.js
+++ b/app/assets/javascripts/ide/stores/mutations.js
@@ -146,13 +146,7 @@ export default {
staged: false,
prevPath: '',
moved: false,
- lastCommit: Object.assign(state.entries[file.path].lastCommit, {
- id: lastCommit.commit.id,
- url: lastCommit.commit_path,
- message: lastCommit.commit.message,
- author: lastCommit.commit.author_name,
- updatedAt: lastCommit.commit.authored_date,
- }),
+ lastCommitSha: lastCommit.commit.id,
});
if (prevPath) {