diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-01-12 00:45:54 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-18 17:18:40 -0600 |
| commit | 0b3f00492bc84a84d7a9867d3d02454d61672660 (patch) | |
| tree | 22635703b30dc3e50f4b0f9795c4f5340ed4e1ec /app/assets/javascripts/merge_conflicts | |
| parent | 588d7e8ae0ded93bf1084fa90fbd9fa9905a944e (diff) | |
| download | gitlab-ce-0b3f00492bc84a84d7a9867d3d02454d61672660.tar.gz | |
resolve all no-dupe-keys eslint violations
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 index c8602003d73..6cc909b0eb3 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 +++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 @@ -1,4 +1,4 @@ -/* eslint-disable comma-dangle, object-shorthand, no-dupe-keys, no-param-reassign, camelcase, prefer-const, no-nested-ternary, no-continue, max-len */ +/* eslint-disable comma-dangle, object-shorthand, no-param-reassign, camelcase, prefer-const, no-nested-ternary, no-continue, max-len */ /* global Cookies */ /* global Vue */ @@ -40,7 +40,6 @@ commitMessage: data.commit_message, sourceBranch: data.source_branch, targetBranch: data.target_branch, - commitMessage: data.commit_message, shortCommitSha: data.commit_sha.slice(0, 7), }; }, |