Commit 0f800e23 authored by Vasilii Iakliushin's avatar Vasilii Iakliushin

Enable improved diff highlighting by default

Closes https://gitlab.com/gitlab-org/gitlab/-/issues/285464

Set the feature flag `improved_merge_diff_highlighting` to enabled
state by default.
parent faae3048
--- ---
title: Improve highlighting for merge diffs title: Improve highlighting for merge diffs
merge_request: 52499 merge_request: 53980
author: author:
type: added type: added
...@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/299884 ...@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/299884
milestone: '13.9' milestone: '13.9'
type: development type: development
group: group::source code group: group::source code
default_enabled: false default_enabled: true
...@@ -77,7 +77,7 @@ module Gitlab ...@@ -77,7 +77,7 @@ module Gitlab
private private
def version def version
if Feature.enabled?(:improved_merge_diff_highlighting, diffable.project) if Feature.enabled?(:improved_merge_diff_highlighting, diffable.project, default_enabled: :yaml)
NEXT_VERSION NEXT_VERSION
else else
VERSION VERSION
......
...@@ -31,7 +31,7 @@ module Gitlab ...@@ -31,7 +31,7 @@ module Gitlab
# Skip inline diff if empty line was replaced with content # Skip inline diff if empty line was replaced with content
return if old_line == "" return if old_line == ""
if Feature.enabled?(:improved_merge_diff_highlighting, project) if Feature.enabled?(:improved_merge_diff_highlighting, project, default_enabled: :yaml)
CharDiff.new(old_line, new_line).changed_ranges(offset: offset) CharDiff.new(old_line, new_line).changed_ranges(offset: offset)
else else
deprecated_diff deprecated_diff
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment