CE upstream - 2018-08-01 09:23 UTC
Files to resolve:
-
@jprovaznik Please resolve (AA) app/models/resource_label_event.rb
-
@fjsanpedro Please resolve (UU) app/services/projects/create_from_template_service.rb
-
@fjsanpedro Please resolve (UU) app/services/projects/gitlab_projects_import_service.rb
-
@jprovaznik Please resolve (AA) app/services/resource_events/change_labels_service.rb
-
@jprovaznik Please resolve (AA) db/migrate/20180726172057_create_resource_label_events.rb
-
@jprovaznik Please resolve (UU) db/schema.rb
-
@fjsanpedro Please resolve (UU) doc/administration/index.md
-
Jamie Schembri Please resolve (UU) doc/api/issues.md
-
Marcel Amirault Please resolve (UU) locale/gitlab.pot
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-08-01
branch.
Thanks in advance!
@jprovaznik 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 Bob Van Landuyt