CE upstream - 2018-09-07 00:21 UTC
Files to resolve:
-
@dennis Please resolve (UU) app/assets/javascripts/pages/projects/project.js
-
@mayra-cabrera Please resolve (UU) app/views/projects/_flash_messages.html.haml
-
@mayra-cabrera Please resolve (UU) config/sidekiq_queues.yml
-
@mikegreiling 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-09-07
branch.
Thanks in advance!
@mayra-cabrera 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 Mayra Cabrera