CE upstream - 2018-10-16 18:21 UTC
Files to resolve:
-
@alejandro Please resolve (UU) Gemfile.lock
-
@alejandro Please resolve (UU) Gemfile.rails5.lock
-
George Tsiolis Please resolve (UU) app/assets/javascripts/boards/components/issue_card_inner.vue
-
George Tsiolis Please resolve (UU) app/assets/javascripts/environments/components/environment_item.vue
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-10-16
branch.
Thanks in advance!
@alejandro 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