Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 17 deletions

diff --git a/app/assets/javascripts/diffs/components/settings_dropdown.vue b/app/assets/javascripts/diffs/components/settings_dropdown.vue
index b8904de8049..2fe2fd6b3d8 100644
--- a/app/assets/javascripts/diffs/components/settings_dropdown.vue
+++ b/app/assets/javascripts/diffs/components/settings_dropdown.vue
@@ -14,26 +14,10 @@ export default {
     GlDropdown,
     GlFormCheckbox,
   },
-  data() {
-    return {
-      checked: false,
-    };
-  },
   computed: {
     ...mapGetters('diffs', ['isInlineView', 'isParallelView']),
     ...mapState('diffs', ['renderTreeList', 'showWhitespace', 'viewDiffsFileByFile']),
   },
-  watch: {
-    viewDiffsFileByFile() {
-      this.checked = this.viewDiffsFileByFile;
-    },
-    checked() {
-      eventHub.$emit(EVT_VIEW_FILE_BY_FILE, { setting: this.checked });
-    },
-  },
-  created() {
-    this.checked = this.viewDiffsFileByFile;
-  },
   methods: {
     ...mapActions('diffs', [
       'setInlineDiffViewType',
@@ -110,7 +94,12 @@ export default {
       </label>
     </div>
     <div class="gl-mt-3 gl-px-3">
-      <gl-form-checkbox v-model="checked" data-testid="file-by-file" class="gl-mb-0">
+      <gl-form-checkbox
+        data-testid="file-by-file"
+        class="gl-mb-0"
+        :checked="viewDiffsFileByFile"
+        @input="toggleFileByFile"
+      >
         {{ $options.i18n.fileByFile }}
       </gl-form-checkbox>
     </div>