diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2017-02-15 16:13:53 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-02-21 12:40:57 -0600 |
| commit | 649c095a671f9fcf6f09449c96b145761a2d6817 (patch) | |
| tree | b668b1732ac8e3a226e29e01524460d0e855f483 /app/controllers | |
| parent | b596dd8fedd9dc8f9487e1e67a52a7b211bd956b (diff) | |
| download | gitlab-ce-649c095a671f9fcf6f09449c96b145761a2d6817.tar.gz | |
Add filtered search to MR pageadd-filtered-search-to-mr
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 |