diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-01-16 14:24:36 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-01-16 14:24:36 +0000 |
| commit | a7d172625a8a8f31eb7730a343951c0de2436da0 (patch) | |
| tree | 455d0fbe1c7d323540aefb8d9bbddea7b9d32dc5 /spec/models/repository_spec.rb | |
| parent | 093856a75ed4a354286f7e6fc7a0f08d9d95a431 (diff) | |
| parent | 91939161aace35823f7a60b25647d5e23285c556 (diff) | |
| download | gitlab-ce-a7d172625a8a8f31eb7730a343951c0de2436da0.tar.gz | |
Merge branch '41666-cannot-search-with-keyword-merge' into 'master'
Resolve "Cannot search with keyword "merge""
Closes #41666
See merge request gitlab-org/gitlab-ce!16462
Diffstat (limited to 'spec/models/repository_spec.rb')
| -rw-r--r-- | spec/models/repository_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index d9395ca61d7..baaa9e3ef44 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -657,7 +657,7 @@ describe Repository do subject { results.first } it { is_expected.to be_an String } - it { expect(subject.lines[2]).to eq("master:CHANGELOG:190: - Feature: Replace teams with group membership\n") } + it { expect(subject.lines[2]).to eq("master:CHANGELOG\x00190\x00 - Feature: Replace teams with group membership\n") } end end |