CE upstream - Sunday
Files to resolve:
-
@matteeyah Please resolve (AA) app/workers/check_gcp_project_billing_worker.rb
-
@matteeyah Please resolve (UU) spec/features/projects/clusters/gcp_spec.rb
-
@matteeyah Please resolve (AA) spec/workers/check_gcp_project_billing_worker_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-01-07
branch.
Thanks in advance!
@matteeyah 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 Luke Bennett