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!

assigned to @lbennett

mentioned in issue gitlab-org/release/tasks#28 (closed)

added 1 commit

• fb2bad26 - Resolve index.js

Compare with previous version

mentioned in commit 80005e96

added 1 commit

• 7facac35 - Resolve form.js

Compare with previous version

marked the checklist item @psimyn Please resolve (AA) app/assets/javascripts/pages/projects/edit/index.js as completed

marked the checklist item @psimyn Please resolve (AA) app/assets/javascripts/pages/projects/issues/form.js as completed

approved this merge request

assigned to @rspeicher

merged

mentioned in commit e2246dbd

mentioned in issue gitlab-org/release/tasks#30 (closed)

added Enterprise Edition label