CE upstream - 2018-09-13 18:21 UTC
Files to resolve:
-
@yorickpeterse Please resolve (UU) app/controllers/passwords_controller.rb
-
@yorickpeterse Please resolve (UU) app/finders/users_finder.rb
-
@yorickpeterse Please resolve (UU) app/models/hooks/service_hook.rb
-
@yorickpeterse Please resolve (UU) app/models/issue.rb
-
@yorickpeterse Please resolve (UU) app/models/note.rb
-
@yorickpeterse Please resolve (UU) app/models/user.rb
-
@yorickpeterse Please resolve (UU) app/services/applications/create_service.rb
-
@yorickpeterse Please resolve (UU) app/services/milestones/update_service.rb
-
@yorickpeterse Please resolve (UU) app/services/search/group_service.rb
-
🙈 jacopo beschi🙉 Please resolve (UU)lib/api/helpers.rb
-
@yorickpeterse Please resolve (UU) lib/api/resource_label_events.rb
-
@yorickpeterse Please resolve (UU) lib/gitlab/group_hierarchy.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-09-13
branch.
Thanks in advance!
@yorickpeterse 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