diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-02-05 09:52:40 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-02-05 09:52:40 +0000 |
| commit | 068b41275f6f142acfddca273ace68d03a6c0730 (patch) | |
| tree | c3f4c927ede7a09242f16771481a0cb7f627fc91 /app/finders/issuable_finder.rb | |
| parent | a34d6abd3b2ee98b0a68b4571c7de61321b4a3ce (diff) | |
| parent | 40198f81843b315f2eb1c1a1a65292b6fc61f9d7 (diff) | |
| download | gitlab-ce-068b41275f6f142acfddca273ace68d03a6c0730.tar.gz | |
Merge branch 'search-title' into 'master'
Add 'in' filter that modifies scope of 'search' filter to issues and merge requests API
See merge request gitlab-org/gitlab-ce!24350
Diffstat (limited to 'app/finders/issuable_finder.rb')
| -rw-r--r-- | app/finders/issuable_finder.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb index 1a69ec85d18..3e08c0ccd8f 100644 --- a/app/finders/issuable_finder.rb +++ b/app/finders/issuable_finder.rb @@ -18,6 +18,7 @@ # assignee_id: integer or 'None' or 'Any' # assignee_username: string # search: string +# in: 'title', 'description', or a string joining them with comma # label_name: string # sort: string # non_archived: boolean @@ -56,6 +57,7 @@ class IssuableFinder milestone_title my_reaction_emoji search + in ] end @@ -408,7 +410,7 @@ class IssuableFinder items = klass.with(cte.to_arel).from(klass.table_name) end - items.full_search(search) + items.full_search(search, matched_columns: params[:in]) end # rubocop: enable CodeReuse/ActiveRecord |