diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index bea24d2b2040b24ae677237a8638c48adeacb0ba..af185887a8caae9ef41078845aed5c3921682f9e 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -21,7 +21,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo before_action only: [:show] do push_frontend_feature_flag(:diffs_batch_load, @project, default_enabled: true) push_frontend_feature_flag(:deploy_from_footer, @project, default_enabled: true) - push_frontend_feature_flag(:single_mr_diff_view, @project) + push_frontend_feature_flag(:single_mr_diff_view, @project, default_enabled: true) push_frontend_feature_flag(:suggest_pipeline) if experiment_enabled?(:suggest_pipeline) end diff --git a/app/serializers/diff_file_entity.rb b/app/serializers/diff_file_entity.rb index c3826692c52f46d9d6e054e5bd5ea4425e0ca8c7..45c16aabe9e8fc348bdf28699adbe83b7daaf431 100644 --- a/app/serializers/diff_file_entity.rb +++ b/app/serializers/diff_file_entity.rb @@ -67,14 +67,14 @@ class DiffFileEntity < DiffFileBaseEntity private def parallel_diff_view?(options, diff_file) - return true unless Feature.enabled?(:single_mr_diff_view, diff_file.repository.project) + return true unless Feature.enabled?(:single_mr_diff_view, diff_file.repository.project, default_enabled: true) # If we're not rendering inline, we must be rendering parallel !inline_diff_view?(options, diff_file) end def inline_diff_view?(options, diff_file) - return true unless Feature.enabled?(:single_mr_diff_view, diff_file.repository.project) + return true unless Feature.enabled?(:single_mr_diff_view, diff_file.repository.project, default_enabled: true) # If nothing is present, inline will be the default. options.fetch(:diff_view, :inline).to_sym == :inline diff --git a/changelogs/unreleased/feature-enable-split-diffs-by-default.yml b/changelogs/unreleased/feature-enable-split-diffs-by-default.yml new file mode 100644 index 0000000000000000000000000000000000000000..9f703a226c63034216d3f6c4387a4be6d84b6c83 --- /dev/null +++ b/changelogs/unreleased/feature-enable-split-diffs-by-default.yml @@ -0,0 +1,5 @@ +--- +title: Diffs load each view style separately, on demand +merge_request: 24821 +author: +type: performance