CE upstream - 2018-04-04 18:26 UTC
Files to resolve:
-
@felipe_artur Please resolve (UU) app/assets/javascripts/pages/groups/issues/index.js
-
@dzaporozhets Please resolve (UU) app/views/admin/application_settings/show.html.haml
-
@felipe_artur Please resolve (UU) doc/user/project/labels.md
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-04-04
branch.
Thanks in advance!
@felipe_artur 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