CE upstream - 2018-10-26 13:21 UTC (!8106) · Merge requests · GitLab.org / GitLab

🤖 GitLab Bot 🤖 requested to merge ce-to-ee-2018-10-26 into master Oct 26, 2018

Files to resolve:

@digitalmoksha Please resolve (UU) db/schema.rb
@godfat Please resolve (AA) lib/gitlab/patch/draw_route.rb

Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-10-26 branch.

Thanks in advance! ❤

@digitalmoksha 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 Oct 26, 2018 by Lin Jen-Shin

CE upstream - 2018-10-26 13:21 UTC

Merge request reports