diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-02-07 16:47:33 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-02-07 16:47:33 +0000 |
| commit | aa2fe07db2e6a0e3dc92a06e61d1a9518adadebc (patch) | |
| tree | eb926f01f7bb23d09e50b2b8e7ecd1983819c14a /app/controllers/projects | |
| parent | 68f9453c66b50b1478af79a3db906c41fc8cc658 (diff) | |
| parent | 8bf5e4795db1915552c1b999ee0c4a9c00466526 (diff) | |
| download | gitlab-ce-aa2fe07db2e6a0e3dc92a06e61d1a9518adadebc.tar.gz | |
Merge branch '19745-new-tasklists-for-merge-requests' into 'master'
Enable fast task lists for merge requests
Closes #19745
See merge request gitlab-org/gitlab-ce!24779
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/merge_requests/application_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests/application_controller.rb b/app/controllers/projects/merge_requests/application_controller.rb index 54ff7ded8e5..6045ee4e171 100644 --- a/app/controllers/projects/merge_requests/application_controller.rb +++ b/app/controllers/projects/merge_requests/application_controller.rb @@ -34,7 +34,8 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont :task_num, :title, :discussion_locked, - label_ids: [] + label_ids: [], + update_task: [:index, :checked, :line_number, :line_source] ] end |