CE upstream - 2018-08-04 09:23 UTC
Files to resolve:
-
@mikegreiling Please resolve (UU) app/assets/javascripts/environments/components/environment_item.vue
-
@dosuken123 Please resolve (UU) spec/fixtures/api/schemas/entities/merge_request_widget.json
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-08-04
branch.
Thanks in advance!
@mikegreiling 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 Jose Ivan Vargas