gyiang
/
gitlab
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix issue #3055 (project search with unmatched parentheses)

This commit is contained in:
Dirceu Pereira Tiegs 2015-10-14 20:14:24 -03:00
parent 976400c1e6
commit d7bcfe4fc0
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/repository.rb
View File

@ -482,7 +482,7 @@ class Repository
def search_files(query, ref)
offset = 2
args = %W(git grep -i -n --before-context #{offset} --after-context #{offset} #{query} #{ref || root_ref})
args = %W(git grep -i -n --before-context #{offset} --after-context #{offset} -e #{query} #{ref || root_ref})
Gitlab::Popen.popen(args, path_to_repo).first.scrub.split(/^--$/)
end

2
lib/gitlab/project_search_results.rb
View File

@ -9,7 +9,7 @@ module Gitlab
else
nil
end
@query = Shellwords.shellescape(query) if query.present?
@query = query
end
def objects(scope, page = nil)

4
spec/lib/gitlab/project_search_results_spec.rb
View File

@ -9,7 +9,7 @@ describe Gitlab::ProjectSearchResults do
it { expect(results.project).to eq(project) }
it { expect(results.repository_ref).to be_nil }
it { expect(results.query).to eq('hello\\ world') }
it { expect(results.query).to eq('hello world') }
end
describe 'initialize with ref' do
@ -18,6 +18,6 @@ describe Gitlab::ProjectSearchResults do
it { expect(results.project).to eq(project) }
it { expect(results.repository_ref).to eq(ref) }
it { expect(results.query).to eq('hello\\ world') }
it { expect(results.query).to eq('hello world') }
end
end