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 /changelogs | |
| 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 'changelogs')
| -rw-r--r-- | changelogs/unreleased/41666-cannot-search-with-keyword-merge-2.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/41666-cannot-search-with-keyword-merge.yml | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/changelogs/unreleased/41666-cannot-search-with-keyword-merge-2.yml b/changelogs/unreleased/41666-cannot-search-with-keyword-merge-2.yml new file mode 100644 index 00000000000..48893862071 --- /dev/null +++ b/changelogs/unreleased/41666-cannot-search-with-keyword-merge-2.yml @@ -0,0 +1,5 @@ +--- +title: Only highlight search results under the highlighting size limit +merge_request: 16462 +author: +type: performance diff --git a/changelogs/unreleased/41666-cannot-search-with-keyword-merge.yml b/changelogs/unreleased/41666-cannot-search-with-keyword-merge.yml new file mode 100644 index 00000000000..3a6fa425c9c --- /dev/null +++ b/changelogs/unreleased/41666-cannot-search-with-keyword-merge.yml @@ -0,0 +1,6 @@ +--- +title: Fix file search results when they match file contents with a number between + two colons +merge_request: 16462 +author: +type: fixed |