diff --git a/config/feature_flags/ops/show_diff_if_head_sha_commit_is_missing.yml b/config/feature_flags/ops/show_diff_if_head_sha_commit_is_missing.yml deleted file mode 100644 index ed933d7d31b5d4ef3b9f31802164cec5f796d6e1..0000000000000000000000000000000000000000 --- a/config/feature_flags/ops/show_diff_if_head_sha_commit_is_missing.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: show_diff_if_head_sha_commit_is_missing -feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/511302 -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/177932 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/513174 -milestone: '17.8' -group: group::code review -type: ops -default_enabled: true diff --git a/lib/gitlab/diff/file.rb b/lib/gitlab/diff/file.rb index 16f2f7c60ecd072ab8922b7b43703148de7a402d..4f6018b63eecd1570bde1aba7ea558f740dc67ec 100644 --- a/lib/gitlab/diff/file.rb +++ b/lib/gitlab/diff/file.rb @@ -338,11 +338,7 @@ def external_storage end def content_changed? - if Feature.enabled?(:show_diff_if_head_sha_commit_is_missing, self.repository.project) - return blobs_changed? if diff_refs && new_blob - else - return blobs_changed? if diff_refs # rubocop:disable Style/IfInsideElse -- Disabling this for the duration of the flag for better readability - end + return blobs_changed? if diff_refs && new_blob return false if new_file? || deleted_file? || renamed_file? diff --git a/spec/lib/gitlab/diff/file_spec.rb b/spec/lib/gitlab/diff/file_spec.rb index b03a5c880492dd9a328be02551222c77551bd4fd..4fce3ebee049d5cfc8ff57ed466d03a6632450cb 100644 --- a/spec/lib/gitlab/diff/file_spec.rb +++ b/spec/lib/gitlab/diff/file_spec.rb @@ -995,27 +995,15 @@ def popen(cmd, path=nil) end describe '#content_changed?' do - context 'when show_diff_if_head_sha_commit_is_missing is true' do - it 'returns true' do - expect(diff_file).to be_content_changed - end - - context 'when head_sha is nil' do - let(:blank_diff_refs) { Gitlab::Diff::DiffRefs.new(base_sha: Gitlab::Git::SHA1_BLANK_SHA, head_sha: nil) } - - it 'returns true' do - expect(diff_file).to be_content_changed - end - end + it 'returns true' do + expect(diff_file).to be_content_changed end - context 'when show_diff_if_head_sha_commit_is_missing is false' do - before do - stub_feature_flags(show_diff_if_head_sha_commit_is_missing: false) - end + context 'when head_sha is nil' do + let(:blank_diff_refs) { Gitlab::Diff::DiffRefs.new(base_sha: Gitlab::Git::SHA1_BLANK_SHA, head_sha: nil) } - it 'returns false' do - expect(diff_file).not_to be_content_changed + it 'returns true' do + expect(diff_file).to be_content_changed end end end