CE upstream - 2018-03-02 21:24 UTC
Files to resolve:
-
@godfat Please resolve (AA) doc/administration/incoming_email.md
-
@godfat Please resolve (UU) doc/administration/index.md
-
haseeb Please resolve (UU) doc/api/merge_requests.md
-
@godfat Please resolve (UU) doc/user/project/issues/create_new_issue.md
-
kushalpandya Please resolve (AU) ee/app/assets/javascripts/protected_branches/index.js
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-03-02
branch.
Thanks in advance!
@godfat 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 Stan Hu