CE upstream - 2018-02-21 18:26 UTC (!4657) · Merge requests · GitLab.org / GitLab

🤖 GitLab Bot 🤖 requested to merge ce-to-ee-2018-02-21 into master Feb 21, 2018

Files to resolve:

@ClemMakesApps Please resolve (UU) app/views/shared/milestones/_sidebar.html.haml
@ClemMakesApps 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-02-21 branch.

Thanks in advance! ❤

@ClemMakesApps 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!

CE upstream - 2018-02-21 18:26 UTC

Merge request reports