CE upstream - 2018-02-22 18:24 UTC
Files to resolve:
-
@ClemMakesApps Please resolve (UU) app/assets/javascripts/dispatcher.js
-
@smcgivern Please resolve (UU) app/uploaders/personal_file_uploader.rb
-
@victorwu Please resolve (UU) doc/user/project/milestones/index.md
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-02-22
branch.
Thanks in advance!
@smcgivern After you resolved the conflicts, please assign to the next person. If you're the last one to resolve the conflicts, please push this to be merged.
Note: This merge request was created by an automated script. Please report any issue at https://gitlab.com/gitlab-org/release-tools/issues!
Edited by Clement Ho