CE upstream - 2018-04-05 18:26 UTC
Files to resolve:
-
@reprazent Please resolve (UU) app/models/project.rb
-
@smcgivern Please resolve (UU) app/policies/merge_request_policy.rb
-
@reprazent Please resolve (AA) lib/api/helpers/projects_helpers.rb
-
@reprazent Please resolve (UU) lib/api/projects.rb
-
@reprazent Please resolve (UU) lib/gitlab/import_export/import_export.yml
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-04-05
branch.
Thanks in advance!
@reprazent 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 Robert Speicher