CE upstream - 2018-11-30 05:21 UTC
Files to resolve:
-
@blabuschagne Please resolve (UU) app/views/projects/tree/_tree_content.html.haml -
@jivanvl Please resolve (UU) locale/gitlab.pot
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-11-30 branch.
Thanks in advance!
@blabuschagne 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 and do not choose to squash the commits.
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 Steve Xuereb