CE upstream - 2018-02-06 18:23 UTC
Files to resolve:
-
@dosuken123 Please resolve (UU) app/models/ci/job_artifact.rb
-
@smcgivern Please resolve (UU) app/views/layouts/nav/sidebar/_group.html.haml
-
@winh Please resolve (UU) app/views/projects/clusters/index.html.haml
-
@dosuken123 Please resolve (UU) app/workers/build_finished_worker.rb
-
@yorickpeterse Please resolve (UU) lib/api/users.rb
-
@winh Please resolve (UU) locale/gitlab.pot
-
@winh Please resolve (UU) spec/javascripts/clusters/clusters_bundle_spec.js
-
@dosuken123 Please resolve (UU) spec/models/ci/job_artifact_spec.rb
-
@winh Please resolve (UU) spec/models/project_services/kubernetes_service_spec.rb
-
@dosuken123 Please resolve (UU) spec/requests/api/jobs_spec.rb
-
@dosuken123 Please resolve (UU) spec/uploaders/job_artifact_uploader_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-02-06
branch.
Thanks in advance!
@dosuken123 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 Ian Baum