CE upstream - 2018-04-25 14:00 UTC
Files to resolve:
-
@zj Please resolve (UU) app/services/projects/destroy_service.rb
-
@zj Please resolve (UU) db/migrate/20161220141214_remove_dot_git_from_group_names.rb
-
@zj Please resolve (UU) db/schema.rb
-
@smcgivern Please resolve (UU) locale/gitlab.pot
-
@smcgivern Please resolve (UU) spec/factories/projects.rb
-
@zj Please resolve (UU) spec/helpers/projects_helper_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-04-25
branch.
Thanks in advance!
@zj 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 Zeger-Jan van de Weg