Commit c64ee58c authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch '337960-remove-between-uses-list-commits-feature-flag' into 'master'

Remove the `between_uses_list_commits` feature flag

See merge request gitlab-org/gitlab!68470
parents 82661deb 2a318274
---
name: between_uses_list_commits
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67591
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337960
milestone: '14.2'
type: development
group: group::source code
default_enabled: false
...@@ -116,13 +116,9 @@ module Gitlab ...@@ -116,13 +116,9 @@ module Gitlab
return [] if Gitlab::Git.blank_ref?(base) || Gitlab::Git.blank_ref?(head) return [] if Gitlab::Git.blank_ref?(base) || Gitlab::Git.blank_ref?(head)
wrapped_gitaly_errors do wrapped_gitaly_errors do
if Feature.enabled?(:between_uses_list_commits, default_enabled: :yaml) revisions = [head, "^#{base}"] # base..head
revisions = [head, "^#{base}"] # base..head
repo.gitaly_commit_client.list_commits(revisions, reverse: true) repo.gitaly_commit_client.list_commits(revisions, reverse: true)
else
repo.gitaly_commit_client.between(base, head)
end
end end
end end
......
...@@ -370,14 +370,6 @@ RSpec.describe Gitlab::Git::Commit, :seed_helper do ...@@ -370,14 +370,6 @@ RSpec.describe Gitlab::Git::Commit, :seed_helper do
end end
it { is_expected.to contain_exactly(SeedRepo::Commit::ID) } it { is_expected.to contain_exactly(SeedRepo::Commit::ID) }
context 'between_uses_list_commits FF disabled' do
before do
stub_feature_flags(between_uses_list_commits: false)
end
it { is_expected.to contain_exactly(SeedRepo::Commit::ID) }
end
end end
describe '.shas_with_signatures' do describe '.shas_with_signatures' do
......
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