Commit 0f2302ae authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch 'id-remove-limited_diff_highlighting-ff' into 'master'

Remove limited_diff_highlighting feature flag

See merge request gitlab-org/gitlab!65310
parents 9d363bca 805635c4
---
name: limited_diff_highlighting
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53768
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323566
milestone: '13.12'
type: development
group: group::source code
default_enabled: true
......@@ -159,7 +159,6 @@ module Gitlab
end
def blobs_too_large?
return false unless Feature.enabled?(:limited_diff_highlighting, project, default_enabled: :yaml)
return true if Gitlab::Highlight.too_large?(diff_file.old_blob&.size)
Gitlab::Highlight.too_large?(diff_file.new_blob&.size)
......
......@@ -151,20 +151,6 @@ RSpec.describe Gitlab::Diff::Highlight do
expect(subject[2].rich_text).to eq(%Q{ <span id="LC7" class="line" lang=""> def popen(cmd, path=nil)</span>\n})
expect(subject[2].rich_text).to be_html_safe
end
context 'when limited_diff_highlighting is disabled' do
before do
stub_feature_flags(limited_diff_highlighting: false)
stub_feature_flags(diff_line_syntax_highlighting: false)
end
it 'blobs are highlighted as plain text with loading all data' do
expect(diff_file.blob).to receive(:load_all_data!).twice
code = %Q{ <span id="LC7" class="line" lang=""> def popen(cmd, path=nil)</span>\n}
expect(subject[2].rich_text).to eq(code)
end
end
end
end
end
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