CE upstream - 2018-06-12 17:46 UTC
Files to resolve:
-
@blackst0ne Please resolve (UU) Gemfile.rails5.lock
-
@ayufan Please resolve (UU) doc/ci/variables/README.md
-
@akaemmerle 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-06-12
branch.
Thanks in advance!
@akaemmerle 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 Stan Hu