diff --git a/config/feature_flags/development/limited_diff_highlighting.yml b/config/feature_flags/development/limited_diff_highlighting.yml deleted file mode 100644 index 1cfd9927c7afd4dd95881d5fa382a9ea035d1b85..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/limited_diff_highlighting.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -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 diff --git a/lib/gitlab/diff/highlight.rb b/lib/gitlab/diff/highlight.rb index aedcfe3cb40c0c01959df7dbae1bae9a29d17ddf..7ee9b8628762a19aea2a64fdea2d245e2550ca67 100644 --- a/lib/gitlab/diff/highlight.rb +++ b/lib/gitlab/diff/highlight.rb @@ -159,7 +159,6 @@ def highlighted_blob_lines(blob) 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) diff --git a/spec/lib/gitlab/diff/highlight_spec.rb b/spec/lib/gitlab/diff/highlight_spec.rb index 94b28c38fa23cb5554b0ab10cb36066c5b9a0c80..624160d2f48c1fbc7aa27c343ed4d10fe2ea5ea1 100644 --- a/spec/lib/gitlab/diff/highlight_spec.rb +++ b/spec/lib/gitlab/diff/highlight_spec.rb @@ -151,20 +151,6 @@ 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