CE upstream - 2018-08-19 06:21 UTC
Files to resolve:
-
@yorickpeterse Please resolve (UU) app/services/protected_branches/legacy_api_update_service.rb
-
@vsizov Please resolve (UU) app/services/users/destroy_service.rb
-
@abrandl Please resolve (AA) db/post_migrate/20180723130817_delete_inconsistent_internal_id_records.rb
-
@abrandl Please resolve (AA) spec/migrations/delete_inconsistent_internal_id_records_spec.rb
-
@brodock Please resolve (UU) spec/spec_helper.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-08-19
branch.
Thanks in advance!
@abrandl 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 Valery Sizov