diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-04-09 18:19:36 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-04-09 18:19:36 +0300 |
| commit | a6218f1bcd78f656d57330e764d3f98e1fb1f3f3 (patch) | |
| tree | 175697ffe45795f36bcb0ceded2affe40069ee00 /app/controllers/projects | |
| parent | 12e35b49576beed0519d1c52aa6fb592d7c59fc7 (diff) | |
| parent | ca884980ee8e6fe1269f5abdb803519d51aa09c0 (diff) | |
Merge branch 'osw-multi-assignees-merge-requests' into 'master'
[Backport] Support multiple assignees for merge requests
See merge request gitlab-org/gitlab-ce!27089
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/merge_requests/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests/application_controller.rb b/app/controllers/projects/merge_requests/application_controller.rb index 6045ee4e171..eb469d2d714 100644 --- a/app/controllers/projects/merge_requests/application_controller.rb +++ b/app/controllers/projects/merge_requests/application_controller.rb @@ -20,7 +20,6 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont def merge_request_params_attributes [ :allow_collaboration, - :assignee_id, :description, :force_remove_source_branch, :lock_version, @@ -35,6 +34,7 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont :title, :discussion_locked, label_ids: [], + assignee_ids: [], update_task: [:index, :checked, :line_number, :line_source] ] end |