CE upstream - 2018-07-02 09:22 UTC
Files to resolve:
-
@ifarkas Please resolve (UU) app/workers/project_cache_worker.rb
-
@timzallmann Please resolve (UU) package.json
-
@ifarkas Please resolve (UU) spec/workers/project_cache_worker_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-07-02
branch.
Thanks in advance!
@ifarkas 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