parent
4e963fed42
commit
1cf2b9a6b8
|
@ -64,6 +64,7 @@ v 8.13.0 (unreleased)
|
|||
- Fix unnecessary escaping of reserved HTML characters in milestone title. !6533
|
||||
- Add organization field to user profile
|
||||
- Fix deploy status responsiveness error !6633
|
||||
- Make searching for commits case insensitive
|
||||
- Fix resolved discussion display in side-by-side diff view !6575
|
||||
- Optimize GitHub importing for speed and memory
|
||||
- API: expose pipeline data in builds API (!6502, Guilherme Salazar)
|
||||
|
|
|
@ -111,8 +111,10 @@ class Repository
|
|||
def find_commits_by_message(query, ref = nil, path = nil, limit = 1000, offset = 0)
|
||||
ref ||= root_ref
|
||||
|
||||
# Limited to 1000 commits for now, could be parameterized?
|
||||
args = %W(#{Gitlab.config.git.bin_path} log #{ref} --pretty=%H --skip #{offset} --max-count #{limit} --grep=#{query})
|
||||
args = %W(
|
||||
#{Gitlab.config.git.bin_path} log #{ref} --pretty=%H --skip #{offset}
|
||||
--max-count #{limit} --grep=#{query} --regexp-ignore-case
|
||||
)
|
||||
args = args.concat(%W(-- #{path})) if path.present?
|
||||
|
||||
git_log_results = Gitlab::Popen.popen(args, path_to_repo).first.lines.map(&:chomp)
|
||||
|
|
|
@ -97,12 +97,20 @@ describe Repository, models: true do
|
|||
end
|
||||
|
||||
describe '#find_commits_by_message' do
|
||||
subject { repository.find_commits_by_message('submodule').map{ |k| k.id } }
|
||||
it 'returns commits with messages containing a given string' do
|
||||
commit_ids = repository.find_commits_by_message('submodule').map(&:id)
|
||||
|
||||
it { is_expected.to include('5937ac0a7beb003549fc5fd26fc247adbce4a52e') }
|
||||
it { is_expected.to include('6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9') }
|
||||
it { is_expected.to include('cfe32cf61b73a0d5e9f13e774abde7ff789b1660') }
|
||||
it { is_expected.not_to include('913c66a37b4a45b9769037c55c2d238bd0942d2e') }
|
||||
expect(commit_ids).to include('5937ac0a7beb003549fc5fd26fc247adbce4a52e')
|
||||
expect(commit_ids).to include('6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9')
|
||||
expect(commit_ids).to include('cfe32cf61b73a0d5e9f13e774abde7ff789b1660')
|
||||
expect(commit_ids).not_to include('913c66a37b4a45b9769037c55c2d238bd0942d2e')
|
||||
end
|
||||
|
||||
it 'is case insensitive' do
|
||||
commit_ids = repository.find_commits_by_message('SUBMODULE').map(&:id)
|
||||
|
||||
expect(commit_ids).to include('5937ac0a7beb003549fc5fd26fc247adbce4a52e')
|
||||
end
|
||||
end
|
||||
|
||||
describe '#blob_at' do
|
||||
|
|
Loading…
Reference in New Issue