CE upstream - 2018-08-12 18:21 UTC
Files to resolve:
-
Annabel Dunstone Gray Please resolve (UU) app/views/projects/blob/_editor.html.haml
-
@annabeldunstone Please resolve (AA) changelogs/unreleased/50126-blocked-user-card.yml
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-08-12
branch.
Thanks in advance!
@annabeldunstone 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