diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-22 18:09:08 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-22 18:09:08 +0300 |
| commit | 7e81076708c00325c922928aa593070b1c9b402c (patch) | |
| tree | 380802616a02d97cf0c6404a4bbb2b67f23335ab /app/assets/javascripts/merge_conflicts | |
| parent | ab08967ca2412c9be06eacbfd2e66157fac5433e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/components/diff_file_editor.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js index 338fbd9078a..064c0f38464 100644 --- a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js +++ b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js @@ -90,9 +90,11 @@ import { __ } from '~/locale'; this.saved = true; // This probably be better placed in the data provider + /* eslint-disable vue/no-mutating-props */ this.file.content = this.editor.getValue(); this.file.resolveEditChanged = this.file.content !== this.originalContent; this.file.promptDiscardConfirmation = false; + /* eslint-enable vue/no-mutating-props */ }, resetEditorContent() { if (this.fileLoaded) { |