diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-22 03:25:55 +0300 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-22 03:25:55 +0300 |
| commit | 5a84b5fd7c5e281de7fad55a308ff35da64f50ca (patch) | |
| tree | 2796f512fbbe0560a299da0da832b291e54fa476 /app/controllers | |
| parent | 4f6e067eca744b74e5f4b03ce23411976dbc7cce (diff) | |
| parent | 649c095a671f9fcf6f09449c96b145761a2d6817 (diff) | |
Merge branch 'add-filtered-search-to-mr' into 'master'
Add filtered search to MR page
Closes #27131
See merge request !9284
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 2bf3542d089..75971faa93e 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -50,6 +50,17 @@ class Projects::MergeRequestsController < Projects::ApplicationController @labels = LabelsFinder.new(current_user, labels_params).execute end + @users = [] + if params[:assignee_id].present? + assignee = User.find_by_id(params[:assignee_id]) + @users.push(assignee) if assignee + end + + if params[:author_id].present? + author = User.find_by_id(params[:author_id]) + @users.push(author) if author + end + respond_to do |format| format.html format.json do |