CE upstream - 2018-04-04 15:28 UTC
Files to resolve:
-
Jan Please resolve (AA) changelogs/unreleased/39880-merge-method-api.yml
-
Jan Please resolve (UU) doc/api/projects.md
-
Jan Please resolve (UU) lib/api/projects.rb
-
Jan Please resolve (UU) spec/requests/api/projects_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-04-04
branch.
Thanks in advance!
@rymai 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 Rémy Coutable