From e66945dad4fceaf57c9f06df6030859513de6747 Mon Sep 17 00:00:00 2001
From: Osher De Paz <osherdepaz@gmail.com>
Date: Fri, 3 Jan 2020 16:26:34 +0200
Subject: [PATCH 01/13] displaying one file at a time when reviewing code

---
 app/assets/javascripts/diffs/components/app.vue       | 11 +++++++----
 .../javascripts/diffs/components/diff_file_header.vue |  1 -
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue
index c07850b1a4f558..76206f02ec221f 100644
--- a/app/assets/javascripts/diffs/components/app.vue
+++ b/app/assets/javascripts/diffs/components/app.vue
@@ -1,4 +1,5 @@
 <script>
+import _ from 'underscore';
 import { mapState, mapGetters, mapActions } from 'vuex';
 import { GlLoadingIcon } from '@gitlab/ui';
 import Mousetrap from 'mousetrap';
@@ -113,9 +114,12 @@ export default {
       emailPatchPath: state => state.diffs.emailPatchPath,
       retrievingBatches: state => state.diffs.retrievingBatches,
     }),
-    ...mapState('diffs', ['showTreeList', 'isLoading', 'startVersion']),
+    ...mapState('diffs', ['showTreeList', 'isLoading', 'startVersion', 'currentDiffFileId']),
     ...mapGetters('diffs', ['isParallelView', 'currentDiffIndex']),
     ...mapGetters(['isNotesFetched', 'getNoteableData']),
+    currentFile() {
+      return _.find(this.diffFiles, {'file_hash': this.currentDiffFileId}) || this.diffFiles[0];
+    },
     targetBranch() {
       return {
         branchName: this.targetBranchName,
@@ -368,9 +372,8 @@ export default {
           <div v-if="isBatchLoading" class="loading"><gl-loading-icon /></div>
           <template v-else-if="renderDiffFiles">
             <diff-file
-              v-for="file in diffFiles"
-              :key="file.newPath"
-              :file="file"
+              :key="currentFile.newPath"
+              :file="currentFile"
               :help-page-path="helpPagePath"
               :can-current-user-fork="canCurrentUserFork"
             />
diff --git a/app/assets/javascripts/diffs/components/diff_file_header.vue b/app/assets/javascripts/diffs/components/diff_file_header.vue
index 5d27c6eb8653a8..1dfc027663120f 100644
--- a/app/assets/javascripts/diffs/components/diff_file_header.vue
+++ b/app/assets/javascripts/diffs/components/diff_file_header.vue
@@ -171,7 +171,6 @@ export default {
         @click.stop="handleToggleFile"
       />
       <a
-        v-once
         id="diffFile.file_path"
         ref="titleWrapper"
         class="append-right-4"
-- 
GitLab


From 35bfc7b868baf0fc89df1a687db7cadd9b137600 Mon Sep 17 00:00:00 2001
From: Osher De Paz <osherdepaz@gmail.com>
Date: Thu, 16 Jan 2020 17:04:47 +0200
Subject: [PATCH 02/13] Added 'View file-by-file diffs' as a profile preference

---
 .../javascripts/diffs/components/app.vue      | 18 +++++++++++++++--
 .../diffs/components/diff_file_header.vue     |  7 ++++++-
 .../profiles/preferences_controller.rb        |  1 +
 .../projects/merge_requests_controller.rb     |  1 +
 app/models/user.rb                            |  1 +
 app/views/profiles/preferences/show.html.haml |  5 +++++
 ..._diffs_file_by_file_to_user_preferences.rb | 20 +++++++++++++++++++
 db/schema.rb                                  |  8 ++++++--
 8 files changed, 56 insertions(+), 5 deletions(-)
 create mode 100644 db/migrate/20200116142300_add_view_diffs_file_by_file_to_user_preferences.rb

diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue
index 76206f02ec221f..4025035e6842e6 100644
--- a/app/assets/javascripts/diffs/components/app.vue
+++ b/app/assets/javascripts/diffs/components/app.vue
@@ -88,6 +88,11 @@ export default {
       required: false,
       default: false,
     },
+    viewDiffsFileByFile: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
   },
   data() {
     const treeWidth =
@@ -118,7 +123,7 @@ export default {
     ...mapGetters('diffs', ['isParallelView', 'currentDiffIndex']),
     ...mapGetters(['isNotesFetched', 'getNoteableData']),
     currentFile() {
-      return _.find(this.diffFiles, {'file_hash': this.currentDiffFileId}) || this.diffFiles[0];
+      return _.find(this.diffFiles, { file_hash: this.currentDiffFileId }) || this.diffFiles[0];
     },
     targetBranch() {
       return {
@@ -174,7 +179,9 @@ export default {
       projectPath: this.projectPath,
       dismissEndpoint: this.dismissEndpoint,
       showSuggestPopover: this.showSuggestPopover,
+      viewDiffsFileByFile: this.viewDiffsFileByFile,
       useSingleDiffStyle: this.glFeatures.singleMrDiffView,
+
     });
 
     if (this.shouldShow) {
@@ -371,12 +378,19 @@ export default {
           <commit-widget v-if="commit" :commit="commit" />
           <div v-if="isBatchLoading" class="loading"><gl-loading-icon /></div>
           <template v-else-if="renderDiffFiles">
-            <diff-file
+            <diff-file v-if="this.viewDiffsFileByFile"
               :key="currentFile.newPath"
               :file="currentFile"
               :help-page-path="helpPagePath"
               :can-current-user-fork="canCurrentUserFork"
             />
+            <diff-file v-else
+              v-for="file in diffFiles"
+              :key="file.newPath"
+              :file="file"
+              :help-page-path="helpPagePath"
+              :can-current-user-fork="canCurrentUserFork"
+            />
           </template>
           <no-changes v-else :changes-empty-state-illustration="changesEmptyStateIllustration" />
         </div>
diff --git a/app/assets/javascripts/diffs/components/diff_file_header.vue b/app/assets/javascripts/diffs/components/diff_file_header.vue
index 1dfc027663120f..b9ae54e1d56a0d 100644
--- a/app/assets/javascripts/diffs/components/diff_file_header.vue
+++ b/app/assets/javascripts/diffs/components/diff_file_header.vue
@@ -55,6 +55,11 @@ export default {
       type: Boolean,
       required: true,
     },
+    viewDiffsFileByFile: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
   },
   computed: {
     ...mapGetters('diffs', ['diffHasExpandedDiscussions', 'diffHasDiscussions']),
@@ -170,7 +175,7 @@ export default {
         class="diff-toggle-caret append-right-5"
         @click.stop="handleToggleFile"
       />
-      <a
+      <a v-bind:v-once:="true? true: false"
         id="diffFile.file_path"
         ref="titleWrapper"
         class="append-right-4"
diff --git a/app/controllers/profiles/preferences_controller.rb b/app/controllers/profiles/preferences_controller.rb
index 214640a5295f78..6655e59ea8cda4 100644
--- a/app/controllers/profiles/preferences_controller.rb
+++ b/app/controllers/profiles/preferences_controller.rb
@@ -48,6 +48,7 @@ def preferences_param_names
       :time_display_relative,
       :time_format_in_24h,
       :show_whitespace_in_diffs,
+      :view_diffs_file_by_file,
       :sourcegraph_enabled
     ]
   end
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 94b5f29eff736f..c7fca922425701 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -62,6 +62,7 @@ def show
         @issuable_sidebar = serializer.represent(@merge_request, serializer: 'sidebar')
         @current_user_data = UserSerializer.new(project: @project).represent(current_user, {}, MergeRequestUserEntity).to_json
         @show_whitespace_default = current_user.nil? || current_user.show_whitespace_in_diffs
+        @file_by_file_default = !current_user.nil? && current_user.view_diffs_file_by_file
 
         set_pipeline_variables
 
diff --git a/app/models/user.rb b/app/models/user.rb
index ee42a987939495..d828e7faf0b184 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -244,6 +244,7 @@ def update_tracked_fields!(request)
   delegate :time_display_relative, :time_display_relative=, to: :user_preference
   delegate :time_format_in_24h, :time_format_in_24h=, to: :user_preference
   delegate :show_whitespace_in_diffs, :show_whitespace_in_diffs=, to: :user_preference
+  delegate :view_diffs_file_by_file, :view_diffs_file_by_file=, to: :user_preference
   delegate :sourcegraph_enabled, :sourcegraph_enabled=, to: :user_preference
   delegate :setup_for_company, :setup_for_company=, to: :user_preference
 
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml
index bf76b7379dd362..e68cf52bf41c1e 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -66,6 +66,11 @@
       = f.label :show_whitespace_in_diffs, class: 'form-check-label' do
         = s_('Preferences|Show whitespace in diffs')
 
+    .form-group.form-check
+      = f.check_box :view_diffs_file_by_file, class: 'form-check-input'
+      = f.label :view_diffs_file_by_file, class: 'form-check-label' do
+        = s_('Preferences|View diffs file-by-file')
+
   .col-sm-12
     %hr
 
diff --git a/db/migrate/20200116142300_add_view_diffs_file_by_file_to_user_preferences.rb b/db/migrate/20200116142300_add_view_diffs_file_by_file_to_user_preferences.rb
new file mode 100644
index 00000000000000..81a4f94c43dd32
--- /dev/null
+++ b/db/migrate/20200116142300_add_view_diffs_file_by_file_to_user_preferences.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddViewDiffsFileByFileToUserPreferences < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_column_with_default :user_preferences, :view_diffs_file_by_file, :boolean, default: false, allow_null: false # rubocop:disable Migration/AddColumnWithDefault
+  end
+
+  def down
+    remove_column :user_preferences, :view_diffs_file_by_file
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 567e135fdff30c..a707ea7580aa68 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_12_29_140154) do
+ActiveRecord::Schema.define(version: 2020_01_16_142300) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_trgm"
@@ -351,7 +351,6 @@
     t.string "sourcegraph_url", limit: 255
     t.boolean "sourcegraph_public_only", default: true, null: false
     t.bigint "snippet_size_limit", default: 52428800, null: false
-    t.integer "minimum_password_length", default: 8, null: false
     t.text "encrypted_akismet_api_key"
     t.string "encrypted_akismet_api_key_iv", limit: 255
     t.text "encrypted_elasticsearch_aws_secret_access_key"
@@ -364,6 +363,7 @@
     t.string "encrypted_slack_app_secret_iv", limit: 255
     t.text "encrypted_slack_app_verification_token"
     t.string "encrypted_slack_app_verification_token_iv", limit: 255
+    t.integer "minimum_password_length", default: 8, null: false
     t.index ["custom_project_templates_group_id"], name: "index_application_settings_on_custom_project_templates_group_id"
     t.index ["file_template_project_id"], name: "index_application_settings_on_file_template_project_id"
     t.index ["instance_administration_project_id"], name: "index_applicationsettings_on_instance_administration_project_id"
@@ -3349,6 +3349,7 @@
     t.index ["creator_id"], name: "index_projects_on_creator_id"
     t.index ["description"], name: "index_projects_on_description_trigram", opclass: :gin_trgm_ops, using: :gin
     t.index ["id", "repository_storage", "last_repository_updated_at"], name: "idx_projects_on_repository_storage_last_repository_updated_at"
+    t.index ["id"], name: "index_on_id_partial_with_legacy_storage", where: "((storage_version < 2) OR (storage_version IS NULL))"
     t.index ["id"], name: "index_projects_on_id_partial_for_visibility", unique: true, where: "(visibility_level = ANY (ARRAY[10, 20]))"
     t.index ["id"], name: "index_projects_on_mirror_and_mirror_trigger_builds_both_true", where: "((mirror IS TRUE) AND (mirror_trigger_builds IS TRUE))"
     t.index ["last_activity_at"], name: "index_projects_on_last_activity_at"
@@ -4037,6 +4038,7 @@
     t.boolean "show_whitespace_in_diffs", default: true, null: false
     t.boolean "sourcegraph_enabled"
     t.boolean "setup_for_company"
+    t.boolean "view_diffs_file_by_file", default: false, null: false
     t.index ["user_id"], name: "index_user_preferences_on_user_id", unique: true
   end
 
@@ -4469,7 +4471,9 @@
   add_foreign_key "ci_pipelines", "projects", name: "fk_86635dbd80", on_delete: :cascade
   add_foreign_key "ci_pipelines_config", "ci_pipelines", column: "pipeline_id", on_delete: :cascade
   add_foreign_key "ci_resource_groups", "projects", name: "fk_774722d144", on_delete: :cascade
+  add_foreign_key "ci_resource_groups", "projects", on_delete: :cascade
   add_foreign_key "ci_resources", "ci_builds", column: "build_id", name: "fk_e169a8e3d5", on_delete: :nullify
+  add_foreign_key "ci_resources", "ci_builds", column: "build_id", on_delete: :nullify
   add_foreign_key "ci_resources", "ci_resource_groups", column: "resource_group_id", on_delete: :cascade
   add_foreign_key "ci_runner_namespaces", "ci_runners", column: "runner_id", on_delete: :cascade
   add_foreign_key "ci_runner_namespaces", "namespaces", on_delete: :cascade
-- 
GitLab


From c7c1410178514c01be3d3ea48e2b6777bfb82580 Mon Sep 17 00:00:00 2001
From: RinSlow <speakupness@gmail.com>
Date: Sun, 19 Jan 2020 11:20:32 +0200
Subject: [PATCH 03/13] Turned on the file-by-file diff

---
 app/assets/javascripts/diffs/components/app.vue              | 2 +-
 app/assets/javascripts/diffs/components/diff_file_header.vue | 2 +-
 db/schema.rb                                                 | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue
index 4025035e6842e6..035d4483deb8d5 100644
--- a/app/assets/javascripts/diffs/components/app.vue
+++ b/app/assets/javascripts/diffs/components/app.vue
@@ -378,7 +378,7 @@ export default {
           <commit-widget v-if="commit" :commit="commit" />
           <div v-if="isBatchLoading" class="loading"><gl-loading-icon /></div>
           <template v-else-if="renderDiffFiles">
-            <diff-file v-if="this.viewDiffsFileByFile"
+            <diff-file v-if="true"
               :key="currentFile.newPath"
               :file="currentFile"
               :help-page-path="helpPagePath"
diff --git a/app/assets/javascripts/diffs/components/diff_file_header.vue b/app/assets/javascripts/diffs/components/diff_file_header.vue
index b9ae54e1d56a0d..423dfc464212ec 100644
--- a/app/assets/javascripts/diffs/components/diff_file_header.vue
+++ b/app/assets/javascripts/diffs/components/diff_file_header.vue
@@ -175,7 +175,7 @@ export default {
         class="diff-toggle-caret append-right-5"
         @click.stop="handleToggleFile"
       />
-      <a v-bind:v-once:="true? true: false"
+      <a v-bind:v-once:="true? false: true"
         id="diffFile.file_path"
         ref="titleWrapper"
         class="append-right-4"
diff --git a/db/schema.rb b/db/schema.rb
index a707ea7580aa68..aaf7a32af75c2b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -351,6 +351,7 @@
     t.string "sourcegraph_url", limit: 255
     t.boolean "sourcegraph_public_only", default: true, null: false
     t.bigint "snippet_size_limit", default: 52428800, null: false
+    t.integer "minimum_password_length", default: 8, null: false
     t.text "encrypted_akismet_api_key"
     t.string "encrypted_akismet_api_key_iv", limit: 255
     t.text "encrypted_elasticsearch_aws_secret_access_key"
@@ -363,7 +364,6 @@
     t.string "encrypted_slack_app_secret_iv", limit: 255
     t.text "encrypted_slack_app_verification_token"
     t.string "encrypted_slack_app_verification_token_iv", limit: 255
-    t.integer "minimum_password_length", default: 8, null: false
     t.index ["custom_project_templates_group_id"], name: "index_application_settings_on_custom_project_templates_group_id"
     t.index ["file_template_project_id"], name: "index_application_settings_on_file_template_project_id"
     t.index ["instance_administration_project_id"], name: "index_applicationsettings_on_instance_administration_project_id"
@@ -3349,7 +3349,6 @@
     t.index ["creator_id"], name: "index_projects_on_creator_id"
     t.index ["description"], name: "index_projects_on_description_trigram", opclass: :gin_trgm_ops, using: :gin
     t.index ["id", "repository_storage", "last_repository_updated_at"], name: "idx_projects_on_repository_storage_last_repository_updated_at"
-    t.index ["id"], name: "index_on_id_partial_with_legacy_storage", where: "((storage_version < 2) OR (storage_version IS NULL))"
     t.index ["id"], name: "index_projects_on_id_partial_for_visibility", unique: true, where: "(visibility_level = ANY (ARRAY[10, 20]))"
     t.index ["id"], name: "index_projects_on_mirror_and_mirror_trigger_builds_both_true", where: "((mirror IS TRUE) AND (mirror_trigger_builds IS TRUE))"
     t.index ["last_activity_at"], name: "index_projects_on_last_activity_at"
@@ -4471,9 +4470,7 @@
   add_foreign_key "ci_pipelines", "projects", name: "fk_86635dbd80", on_delete: :cascade
   add_foreign_key "ci_pipelines_config", "ci_pipelines", column: "pipeline_id", on_delete: :cascade
   add_foreign_key "ci_resource_groups", "projects", name: "fk_774722d144", on_delete: :cascade
-  add_foreign_key "ci_resource_groups", "projects", on_delete: :cascade
   add_foreign_key "ci_resources", "ci_builds", column: "build_id", name: "fk_e169a8e3d5", on_delete: :nullify
-  add_foreign_key "ci_resources", "ci_builds", column: "build_id", on_delete: :nullify
   add_foreign_key "ci_resources", "ci_resource_groups", column: "resource_group_id", on_delete: :cascade
   add_foreign_key "ci_runner_namespaces", "ci_runners", column: "runner_id", on_delete: :cascade
   add_foreign_key "ci_runner_namespaces", "namespaces", on_delete: :cascade
-- 
GitLab


From 8eb54e212d7e59010c6a4fa48b39682c46cdae96 Mon Sep 17 00:00:00 2001
From: RinSlow <speakupness@gmail.com>
Date: Sun, 19 Jan 2020 11:57:25 +0200
Subject: [PATCH 04/13] File-by-file is now controlled via a single value in
 index.js

---
 app/assets/javascripts/diffs/components/app.vue            | 3 ++-
 app/assets/javascripts/diffs/components/diff_file.vue      | 5 +++++
 .../javascripts/diffs/components/diff_file_header.vue      | 7 +------
 app/assets/javascripts/diffs/index.js                      | 1 +
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue
index 035d4483deb8d5..038c0353237312 100644
--- a/app/assets/javascripts/diffs/components/app.vue
+++ b/app/assets/javascripts/diffs/components/app.vue
@@ -378,9 +378,10 @@ export default {
           <commit-widget v-if="commit" :commit="commit" />
           <div v-if="isBatchLoading" class="loading"><gl-loading-icon /></div>
           <template v-else-if="renderDiffFiles">
-            <diff-file v-if="true"
+            <diff-file v-if="viewDiffsFileByFile"
               :key="currentFile.newPath"
               :file="currentFile"
+              :view-diffs-file-by-file="viewDiffsFileByFile"
               :help-page-path="helpPagePath"
               :can-current-user-fork="canCurrentUserFork"
             />
diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue
index 0dbff4ffceca33..9c488ee377b007 100644
--- a/app/assets/javascripts/diffs/components/diff_file.vue
+++ b/app/assets/javascripts/diffs/components/diff_file.vue
@@ -29,6 +29,11 @@ export default {
       required: false,
       default: '',
     },
+    viewDiffsFileByFile: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
   },
   data() {
     return {
diff --git a/app/assets/javascripts/diffs/components/diff_file_header.vue b/app/assets/javascripts/diffs/components/diff_file_header.vue
index 423dfc464212ec..c1a17e69f07d43 100644
--- a/app/assets/javascripts/diffs/components/diff_file_header.vue
+++ b/app/assets/javascripts/diffs/components/diff_file_header.vue
@@ -55,11 +55,6 @@ export default {
       type: Boolean,
       required: true,
     },
-    viewDiffsFileByFile: {
-      type: Boolean,
-      required: false,
-      default: false
-    },
   },
   computed: {
     ...mapGetters('diffs', ['diffHasExpandedDiscussions', 'diffHasDiscussions']),
@@ -175,7 +170,7 @@ export default {
         class="diff-toggle-caret append-right-5"
         @click.stop="handleToggleFile"
       />
-      <a v-bind:v-once:="true? false: true"
+      <a :v-once="!diffFile.viewDiffsFileByFile"
         id="diffFile.file_path"
         ref="titleWrapper"
         class="append-right-4"
diff --git a/app/assets/javascripts/diffs/index.js b/app/assets/javascripts/diffs/index.js
index 375ac80021f13a..3c8add08cb1b2e 100644
--- a/app/assets/javascripts/diffs/index.js
+++ b/app/assets/javascripts/diffs/index.js
@@ -113,6 +113,7 @@ export default function initDiffsApp(store) {
           dismissEndpoint: this.dismissEndpoint,
           showSuggestPopover: this.showSuggestPopover,
           showWhitespaceDefault: this.showWhitespaceDefault,
+          viewDiffsFileByFile: false,
         },
       });
     },
-- 
GitLab


From 1cf11ee4e5ad00575e656dbeda7348c07d607cc6 Mon Sep 17 00:00:00 2001
From: RinSlow <speakupness@gmail.com>
Date: Sun, 19 Jan 2020 13:12:22 +0200
Subject: [PATCH 05/13] File by file is now read from the perferences settings.

---
 app/assets/javascripts/diffs/index.js            | 3 ++-
 app/views/projects/merge_requests/show.html.haml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/diffs/index.js b/app/assets/javascripts/diffs/index.js
index 3c8add08cb1b2e..cff1a520b3225b 100644
--- a/app/assets/javascripts/diffs/index.js
+++ b/app/assets/javascripts/diffs/index.js
@@ -77,6 +77,7 @@ export default function initDiffsApp(store) {
         dismissEndpoint: dataset.dismissEndpoint,
         showSuggestPopover: parseBoolean(dataset.showSuggestPopover),
         showWhitespaceDefault: parseBoolean(dataset.showWhitespaceDefault),
+        viewDiffsFileByFile: parseBoolean(dataset.fileByFileDefault),
       };
     },
     computed: {
@@ -113,7 +114,7 @@ export default function initDiffsApp(store) {
           dismissEndpoint: this.dismissEndpoint,
           showSuggestPopover: this.showSuggestPopover,
           showWhitespaceDefault: this.showWhitespaceDefault,
-          viewDiffsFileByFile: false,
+          viewDiffsFileByFile: this.viewDiffsFileByFile,
         },
       });
     },
diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml
index 310cd355d229ea..3e022511177fd6 100644
--- a/app/views/projects/merge_requests/show.html.haml
+++ b/app/views/projects/merge_requests/show.html.haml
@@ -85,7 +85,8 @@
         is_fluid_layout: fluid_layout.to_s,
         dismiss_endpoint: user_callouts_path,
         show_suggest_popover: show_suggest_popover?.to_s,
-        show_whitespace_default: @show_whitespace_default.to_s }
+        show_whitespace_default: @show_whitespace_default.to_s,
+        file_by_file_default: @file_by_file_default.to_s }
 
     .mr-loading-status
       = spinner
-- 
GitLab


From a86868d8111c11f410f7cb3ba20ff19ffd35aff4 Mon Sep 17 00:00:00 2001
From: RinSlow <speakupness@gmail.com>
Date: Mon, 24 Feb 2020 11:14:33 +0200
Subject: [PATCH 06/13] Lints should pass now.

---
 app/assets/javascripts/diffs/components/app.vue              | 4 ++--
 app/assets/javascripts/diffs/components/diff_file_header.vue | 4 ++--
 locale/gitlab.pot                                            | 3 +++
 package.json                                                 | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue
index 1b878c24713e61..b816d20620a35f 100644
--- a/app/assets/javascripts/diffs/components/app.vue
+++ b/app/assets/javascripts/diffs/components/app.vue
@@ -418,8 +418,8 @@ export default {
               :help-page-path="helpPagePath"
               :can-current-user-fork="canCurrentUserFork"
             />
-            <diff-file v-else
-              v-for="file in diffFiles"
+            <diff-file v-for="file in diffFiles"
+              v-else
               :key="file.newPath"
               :file="file"
               :help-page-path="helpPagePath"
diff --git a/app/assets/javascripts/diffs/components/diff_file_header.vue b/app/assets/javascripts/diffs/components/diff_file_header.vue
index 2f30ceac39f23b..5f026027fe8a9c 100644
--- a/app/assets/javascripts/diffs/components/diff_file_header.vue
+++ b/app/assets/javascripts/diffs/components/diff_file_header.vue
@@ -170,9 +170,9 @@ export default {
         class="diff-toggle-caret append-right-5"
         @click.stop="handleToggleFile"
       />
-      <a :v-once="!diffFile.viewDiffsFileByFile"
-        id="diffFile.file_path"
+      <a id="diffFile.file_path"
         ref="titleWrapper"
+        :v-once="!diffFile.viewDiffsFileByFile"
         class="append-right-4"
         :href="titleLink"
         @click="handleFileNameClick"
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index d0cb12da37c0d9..cb4ab03beb28ec 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -14246,6 +14246,9 @@ msgstr ""
 msgid "Preferences|Render whitespace characters in the Web IDE"
 msgstr ""
 
+msgid "Preferences|View diffs file-by-file"
+msgstr ""
+
 msgid "Preferences|Show whitespace changes in diffs"
 msgstr ""
 
diff --git a/package.json b/package.json
index 4398ecc0bc4724..1825ad929be754 100644
--- a/package.json
+++ b/package.json
@@ -147,6 +147,7 @@
   "devDependencies": {
     "@babel/plugin-transform-modules-commonjs": "^7.5.0",
     "@gitlab/eslint-config": "^3.0.0",
+    "@gitlab/eslint-plugin-vue-i18n": "^2.0.0",
     "@vue/test-utils": "^1.0.0-beta.30",
     "axios-mock-adapter": "^1.15.0",
     "babel-jest": "^24.1.0",
-- 
GitLab


From 1a6a71f8bdf17ad154f306a20bcdcd925a6ef67f Mon Sep 17 00:00:00 2001
From: Osher De Paz <osherdepaz@gmail.com>
Date: Sun, 1 Mar 2020 23:01:12 +0200
Subject: [PATCH 07/13] prettify all JS code

---
 app/assets/javascripts/diffs/components/app.vue          | 9 +++++----
 app/assets/javascripts/diffs/components/diff_file.vue    | 2 +-
 .../javascripts/diffs/components/diff_file_header.vue    | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue
index b816d20620a35f..f92e83fd90b08f 100644
--- a/app/assets/javascripts/diffs/components/app.vue
+++ b/app/assets/javascripts/diffs/components/app.vue
@@ -92,7 +92,7 @@ export default {
     viewDiffsFileByFile: {
       type: Boolean,
       required: false,
-      default: false
+      default: false,
     },
   },
   data() {
@@ -183,7 +183,6 @@ export default {
       showSuggestPopover: this.showSuggestPopover,
       viewDiffsFileByFile: this.viewDiffsFileByFile,
       useSingleDiffStyle: this.glFeatures.singleMrDiffView,
-
     });
 
     if (this.shouldShow) {
@@ -411,14 +410,16 @@ export default {
           <commit-widget v-if="commit" :commit="commit" />
           <div v-if="isBatchLoading" class="loading"><gl-loading-icon /></div>
           <template v-else-if="renderDiffFiles">
-            <diff-file v-if="viewDiffsFileByFile"
+            <diff-file
+              v-if="viewDiffsFileByFile"
               :key="currentFile.newPath"
               :file="currentFile"
               :view-diffs-file-by-file="viewDiffsFileByFile"
               :help-page-path="helpPagePath"
               :can-current-user-fork="canCurrentUserFork"
             />
-            <diff-file v-for="file in diffFiles"
+            <diff-file
+              v-for="file in diffFiles"
               v-else
               :key="file.newPath"
               :file="file"
diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue
index 4f40bfd7b1b945..9f9790eb5f7b82 100644
--- a/app/assets/javascripts/diffs/components/diff_file.vue
+++ b/app/assets/javascripts/diffs/components/diff_file.vue
@@ -33,7 +33,7 @@ export default {
     viewDiffsFileByFile: {
       type: Boolean,
       required: false,
-      default: false
+      default: false,
     },
   },
   data() {
diff --git a/app/assets/javascripts/diffs/components/diff_file_header.vue b/app/assets/javascripts/diffs/components/diff_file_header.vue
index 5f026027fe8a9c..1bfd26be1122bf 100644
--- a/app/assets/javascripts/diffs/components/diff_file_header.vue
+++ b/app/assets/javascripts/diffs/components/diff_file_header.vue
@@ -170,7 +170,8 @@ export default {
         class="diff-toggle-caret append-right-5"
         @click.stop="handleToggleFile"
       />
-      <a id="diffFile.file_path"
+      <a
+        id="diffFile.file_path"
         ref="titleWrapper"
         :v-once="!diffFile.viewDiffsFileByFile"
         class="append-right-4"
-- 
GitLab


From 3ffc1b344d2f0142d51b962e400e03fd26d15a5f Mon Sep 17 00:00:00 2001
From: Osher De Paz <osherdepaz@gmail.com>
Date: Wed, 4 Mar 2020 22:06:05 +0200
Subject: [PATCH 08/13] fixed second static analysis

---
 locale/gitlab.pot | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index cb4ab03beb28ec..1523b6d24b7fc3 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -14246,9 +14246,6 @@ msgstr ""
 msgid "Preferences|Render whitespace characters in the Web IDE"
 msgstr ""
 
-msgid "Preferences|View diffs file-by-file"
-msgstr ""
-
 msgid "Preferences|Show whitespace changes in diffs"
 msgstr ""
 
@@ -14285,6 +14282,9 @@ msgstr ""
 msgid "Preferences|Use relative times"
 msgstr ""
 
+msgid "Preferences|View diffs file-by-file"
+msgstr ""
+
 msgid "Press %{key}-C to copy"
 msgstr ""
 
-- 
GitLab


From a590d46a4ca2384ed7611ce35d40eb5a1949f09f Mon Sep 17 00:00:00 2001
From: Osher De Paz <osherdepaz@gmail.com>
Date: Fri, 20 Mar 2020 14:57:35 +0200
Subject: [PATCH 09/13] removed duplication of definition of a 'template'
 column in DB

---
 db/schema.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/db/schema.rb b/db/schema.rb
index 6d230ff8f57014..af151eec43e9b0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -3961,7 +3961,6 @@
     t.boolean "deployment_events", default: false, null: false
     t.string "description", limit: 500
     t.boolean "comment_on_event_enabled", default: true, null: false
-    t.boolean "template", default: false
     t.boolean "instance", default: false, null: false
     t.index ["project_id"], name: "index_services_on_project_id"
     t.index ["template"], name: "index_services_on_template"
-- 
GitLab


From 75c6305b4cacd51e298d60a7e31941be08e2ca75 Mon Sep 17 00:00:00 2001
From: Osher De Paz <osherdepaz@gmail.com>
Date: Fri, 20 Mar 2020 22:10:56 +0200
Subject: [PATCH 10/13] removed unnecessary lint disabling

---
 ...116142300_add_view_diffs_file_by_file_to_user_preferences.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/migrate/20200116142300_add_view_diffs_file_by_file_to_user_preferences.rb b/db/migrate/20200116142300_add_view_diffs_file_by_file_to_user_preferences.rb
index 81a4f94c43dd32..16e9ee6c3c1947 100644
--- a/db/migrate/20200116142300_add_view_diffs_file_by_file_to_user_preferences.rb
+++ b/db/migrate/20200116142300_add_view_diffs_file_by_file_to_user_preferences.rb
@@ -11,7 +11,7 @@ class AddViewDiffsFileByFileToUserPreferences < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
 
   def up
-    add_column_with_default :user_preferences, :view_diffs_file_by_file, :boolean, default: false, allow_null: false # rubocop:disable Migration/AddColumnWithDefault
+    add_column_with_default :user_preferences, :view_diffs_file_by_file, :boolean, default: false, allow_null: false
   end
 
   def down
-- 
GitLab


From 721739024dcb280fb30244c620e82069935ec093 Mon Sep 17 00:00:00 2001
From: Osher <osherdepaz@gmail.com>
Date: Sat, 21 Mar 2020 11:33:46 +0000
Subject: [PATCH 11/13] Apply suggestion to
 app/assets/javascripts/diffs/components/app.vue

---
 app/assets/javascripts/diffs/components/app.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue
index bbe74cd8740bd8..d9c18711fc5ecb 100644
--- a/app/assets/javascripts/diffs/components/app.vue
+++ b/app/assets/javascripts/diffs/components/app.vue
@@ -125,7 +125,7 @@ export default {
     ...mapGetters('diffs', ['isParallelView', 'currentDiffIndex']),
     ...mapGetters(['isNotesFetched', 'getNoteableData']),
     currentFile() {
-      return _.find(this.diffFiles, { file_hash: this.currentDiffFileId }) || this.diffFiles[0];
+      return this.diffFiles.find(file => file.file_hash === this.currentDiffFileId) || this.diffFiles[0]
     },
     targetBranch() {
       return {
-- 
GitLab


From 9c718509e814d81794b310e1b7cd3309d2c62a1e Mon Sep 17 00:00:00 2001
From: Osher De Paz <osherdepaz@gmail.com>
Date: Sat, 21 Mar 2020 13:34:32 +0200
Subject: [PATCH 12/13] removed unused import of _

---
 app/assets/javascripts/diffs/components/app.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue
index d9c18711fc5ecb..4b1a5f9912fa2c 100644
--- a/app/assets/javascripts/diffs/components/app.vue
+++ b/app/assets/javascripts/diffs/components/app.vue
@@ -1,5 +1,4 @@
 <script>
-import _ from 'underscore';
 import { mapState, mapGetters, mapActions } from 'vuex';
 import { GlLoadingIcon } from '@gitlab/ui';
 import Mousetrap from 'mousetrap';
-- 
GitLab


From 26334d212ec7abb1858821ed0faf91b06e983809 Mon Sep 17 00:00:00 2001
From: Osher De Paz <osherdepaz@gmail.com>
Date: Sat, 21 Mar 2020 15:14:09 +0200
Subject: [PATCH 13/13] prettify JS code

---
 app/assets/javascripts/diffs/components/app.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue
index 4b1a5f9912fa2c..06f96eff758c0f 100644
--- a/app/assets/javascripts/diffs/components/app.vue
+++ b/app/assets/javascripts/diffs/components/app.vue
@@ -124,7 +124,9 @@ export default {
     ...mapGetters('diffs', ['isParallelView', 'currentDiffIndex']),
     ...mapGetters(['isNotesFetched', 'getNoteableData']),
     currentFile() {
-      return this.diffFiles.find(file => file.file_hash === this.currentDiffFileId) || this.diffFiles[0]
+      return (
+        this.diffFiles.find(file => file.file_hash === this.currentDiffFileId) || this.diffFiles[0]
+      );
     },
     targetBranch() {
       return {
-- 
GitLab