CE upstream - 2018-03-23 06:25 UTC
Files to resolve:
-
@dennistang Please resolve (UU) app/assets/javascripts/boards/components/issue_card_inner.js
-
@toon Please resolve (UU) app/views/layouts/_page.html.haml
-
@tnir Please resolve (UU) app/views/projects/branches/_branch.html.haml
-
@mikegreiling Please resolve (UU) config/webpack.config.js
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-03-23
branch.
Thanks in advance!
@tnir 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 Robert Speicher