diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue
index 77cd2afc10617a89c8e2fbc189b08ac8288e7d7d..06f96eff758c0f3cd516d2d7ba77b56fa1ce844f 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 =
@@ -115,9 +120,14 @@ 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 (
+        this.diffFiles.find(file => file.file_hash === this.currentDiffFileId) || this.diffFiles[0]
+      );
+    },
     targetBranch() {
       return {
         branchName: this.targetBranchName,
@@ -172,6 +182,7 @@ export default {
       projectPath: this.projectPath,
       dismissEndpoint: this.dismissEndpoint,
       showSuggestPopover: this.showSuggestPopover,
+      viewDiffsFileByFile: this.viewDiffsFileByFile,
       useSingleDiffStyle: this.glFeatures.singleMrDiffView,
     });
 
@@ -400,8 +411,17 @@ export default {
           <commit-widget v-if="commit" :commit="commit" />
           <div v-if="isBatchLoading" class="loading"><gl-loading-icon size="lg" /></div>
           <template v-else-if="renderDiffFiles">
+            <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"
+              v-else
               :key="file.newPath"
               :file="file"
               :help-page-path="helpPagePath"
diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue
index 8babc05f1cea2e66de339beedaadfb540de387d3..2284bfda250af79dc8c5771c8bb408e894ae78a2 100644
--- a/app/assets/javascripts/diffs/components/diff_file.vue
+++ b/app/assets/javascripts/diffs/components/diff_file.vue
@@ -30,6 +30,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 d4270960f57a48f8bf32d04cc16efcd1777d48ce..c8c8bb16d3423467d6a6dfa02d5868f82af1cea9 100644
--- a/app/assets/javascripts/diffs/components/diff_file_header.vue
+++ b/app/assets/javascripts/diffs/components/diff_file_header.vue
@@ -171,9 +171,9 @@ export default {
         @click.stop="handleToggleFile"
       />
       <a
-        v-once
         id="diffFile.file_path"
         ref="titleWrapper"
+        :v-once="!diffFile.viewDiffsFileByFile"
         class="append-right-4"
         :href="titleLink"
         @click="handleFileNameClick"
diff --git a/app/assets/javascripts/diffs/index.js b/app/assets/javascripts/diffs/index.js
index 375ac80021f13a0ff343c607761c2ebf70030a64..cff1a520b3225b3f22e44d9446404ce28cbb8efa 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,6 +114,7 @@ export default function initDiffsApp(store) {
           dismissEndpoint: this.dismissEndpoint,
           showSuggestPopover: this.showSuggestPopover,
           showWhitespaceDefault: this.showWhitespaceDefault,
+          viewDiffsFileByFile: this.viewDiffsFileByFile,
         },
       });
     },
diff --git a/app/controllers/profiles/preferences_controller.rb b/app/controllers/profiles/preferences_controller.rb
index 1477d79c911eb73a093792661c6ab4bb42c7be56..8653fe3b6ede31498aea16e383b0dff16ac492e0 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,
       :tab_width,
       :sourcegraph_enabled,
       :render_whitespace_in_code
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index af185887a8caae9ef41078845aed5c3921682f9e..9766fb1af99d2b8f39c212ae7947d69d8c6ccede 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -63,6 +63,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 17850d13e489a89f646b3af61f4d5832485a6589..121a10aea1bf973a2bd4cb96797667e43b63c3bd 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -258,6 +258,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 :tab_width, :tab_width=, 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 12d42ce9892851b0ed1453ab64ee1e2eae0c9f82..96aa262ac5b22a1f274576b6aee48dad2fe94141 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -79,6 +79,11 @@
       .form-text.text-muted
         = s_('Preferences|Must be a number between %{min} and %{max}') % { min: Gitlab::TabWidth::MIN, max: Gitlab::TabWidth::MAX }
 
+    .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/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml
index d65c874f2453a2a59e59bec9e92eafc28aae12c5..fb3f9175c83bf98d505f2455fa16e26141e675f1 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
       .loading.hide
diff --git a/changelogs/unreleased/view-diffs-file-by-file.yml b/changelogs/unreleased/view-diffs-file-by-file.yml
new file mode 100644
index 0000000000000000000000000000000000000000..58936fbe65a51d81f49dd9fcff2163c7a10fde42
--- /dev/null
+++ b/changelogs/unreleased/view-diffs-file-by-file.yml
@@ -0,0 +1,5 @@
+---
+title: Show diffs file-by-file (via Preference Screen)
+merge_request: 22427
+author: rinslow
+type: added
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 0000000000000000000000000000000000000000..16e9ee6c3c19476f257f4f645f1fe05687c5c7ff
--- /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
+  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 741bb2b9262f80baa214cb3362b37b1b8e6af9ec..af151eec43e9b078b6b2712d7204c7d2598cb111 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -340,15 +340,15 @@
     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.boolean "force_pages_access_control", default: false, null: false
     t.boolean "updating_name_disabled_for_users", default: false, null: false
+    t.boolean "force_pages_access_control", default: false, null: false
     t.integer "instance_administrators_group_id"
-    t.integer "elasticsearch_indexed_field_length_limit", default: 0, null: false
-    t.integer "elasticsearch_max_bulk_size_mb", limit: 2, default: 10, null: false
-    t.integer "elasticsearch_max_bulk_concurrency", limit: 2, default: 10, null: false
     t.boolean "disable_overriding_approvers_per_merge_request", default: false, null: false
     t.boolean "prevent_merge_requests_author_approval", default: false, null: false
     t.boolean "prevent_merge_requests_committers_approval", default: false, null: false
+    t.integer "elasticsearch_indexed_field_length_limit", default: 0, null: false
+    t.integer "elasticsearch_max_bulk_size_mb", limit: 2, default: 10, null: false
+    t.integer "elasticsearch_max_bulk_concurrency", limit: 2, default: 10, null: false
     t.boolean "email_restrictions_enabled", default: false, null: false
     t.text "email_restrictions"
     t.boolean "npm_package_requests_forwarding", default: true, null: false
@@ -1527,7 +1527,6 @@
     t.string "state", default: "available", null: false
     t.string "slug", null: false
     t.datetime_with_timezone "auto_stop_at"
-    t.index ["auto_stop_at"], name: "index_environments_on_auto_stop_at", where: "(auto_stop_at IS NOT NULL)"
     t.index ["name"], name: "index_environments_on_name_varchar_pattern_ops", opclass: :varchar_pattern_ops
     t.index ["project_id", "name"], name: "index_environments_on_project_id_and_name", unique: true
     t.index ["project_id", "slug"], name: "index_environments_on_project_id_and_slug", unique: true
@@ -2464,34 +2463,36 @@
   end
 
   create_table "merge_request_context_commit_diff_files", id: false, force: :cascade do |t|
+    t.bigint "merge_request_context_commit_id"
     t.binary "sha", null: false
     t.integer "relative_order", null: false
+    t.string "a_mode", limit: 255, null: false
+    t.string "b_mode", limit: 255, null: false
     t.boolean "new_file", null: false
     t.boolean "renamed_file", null: false
     t.boolean "deleted_file", null: false
     t.boolean "too_large", null: false
-    t.string "a_mode", limit: 255, null: false
-    t.string "b_mode", limit: 255, null: false
+    t.boolean "binary"
     t.text "new_path", null: false
     t.text "old_path", null: false
     t.text "diff"
-    t.boolean "binary"
-    t.bigint "merge_request_context_commit_id"
     t.index ["merge_request_context_commit_id", "sha"], name: "idx_mr_cc_diff_files_on_mr_cc_id_and_sha"
+    t.index ["merge_request_context_commit_id"], name: "idx_mr_cc_diff_files_on_mr_cc_id"
   end
 
   create_table "merge_request_context_commits", force: :cascade do |t|
+    t.bigint "merge_request_id"
     t.datetime_with_timezone "authored_date"
     t.datetime_with_timezone "committed_date"
-    t.integer "relative_order", null: false
     t.binary "sha", null: false
+    t.integer "relative_order", null: false
     t.text "author_name"
     t.text "author_email"
     t.text "committer_name"
     t.text "committer_email"
     t.text "message"
-    t.bigint "merge_request_id"
     t.index ["merge_request_id", "sha"], name: "index_mr_context_commits_on_merge_request_id_and_sha", unique: true
+    t.index ["merge_request_id"], name: "index_merge_request_context_commits_on_merge_request_id"
   end
 
   create_table "merge_request_diff_commits", id: false, force: :cascade do |t|
@@ -3480,8 +3481,8 @@
     t.boolean "remove_source_branch_after_merge"
     t.date "marked_for_deletion_at"
     t.integer "marked_for_deletion_by_user_id"
-    t.boolean "autoclose_referenced_issues"
     t.string "suggestion_commit_message", limit: 255
+    t.boolean "autoclose_referenced_issues"
     t.index "lower((name)::text)", name: "index_projects_on_lower_name"
     t.index ["created_at", "id"], name: "index_projects_api_created_at_id_desc", order: { id: :desc }
     t.index ["created_at", "id"], name: "index_projects_api_vis20_created_at", where: "(visibility_level = 20)"
@@ -3943,6 +3944,7 @@
     t.datetime "updated_at"
     t.boolean "active", default: false, null: false
     t.text "properties"
+    t.boolean "template", default: false
     t.boolean "push_events", default: true
     t.boolean "issues_events", default: true
     t.boolean "merge_requests_events", default: true
@@ -3959,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"
@@ -4292,6 +4293,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.boolean "render_whitespace_in_code"
     t.integer "tab_width", limit: 2
     t.bigint "feature_filter_type"
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index a431612bfe7cb36a68776bf58f92e39da7795d57..b5ada41921573c22524750a0cdb8160e5ca8797b 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -14686,6 +14686,9 @@ msgstr ""
 msgid "Preferences|Use relative times"
 msgstr ""
 
+msgid "Preferences|View diffs file-by-file"
+msgstr ""
+
 msgid "Press %{key}-C to copy"
 msgstr ""
 
diff --git a/package.json b/package.json
index fa359867ea2585dc6576d8a2eb3d59f551683a82..56ed91c445d3a5733ff8a239dc8a51464ad16b41 100644
--- a/package.json
+++ b/package.json
@@ -147,6 +147,7 @@
   "devDependencies": {
     "@babel/plugin-transform-modules-commonjs": "^7.8.3",
     "@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",