CE upstream - Monday
Files to resolve:
-
@psimyn Please resolve (AA) app/assets/javascripts/pages/projects/edit/index.js
-
@psimyn Please resolve (AA) app/assets/javascripts/pages/projects/issues/form.js
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-01-15
branch.
Thanks in advance!
@psimyn 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 Luke Bennett