CE upstream - 2018-02-06 09:41 UTC
Files to resolve:
-
@zj Please resolve (UU) .flayignore
-
@yorickpeterse Please resolve (UU) app/controllers/projects/issues_controller.rb
-
@yorickpeterse Please resolve (UU) app/controllers/projects/merge_requests_controller.rb
-
@mayra-cabrera Please resolve (UU) app/models/namespace.rb
-
@fjsanpedro Please resolve (UU) app/models/wiki_page.rb
-
@mayra-cabrera Please resolve (UU) config/routes/group.rb
-
@abrandl Please resolve (UU) db/schema.rb
-
@fjsanpedro Please resolve (UU) doc/administration/auth/ldap.md
-
@mayra-cabrera Please resolve (UU) doc/user/group/index.md
-
@fjsanpedro Please resolve (UU) locale/gitlab.pot
-
@mbergeron Please resolve (UU) spec/factories/uploads.rb
-
@mayra-cabrera Please resolve (UU) spec/models/namespace_spec.rb
-
@mbergeron Please resolve (UU) spec/uploaders/file_uploader_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-02-06
branch.
Thanks in advance!
@mayra-cabrera 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 Micaël Bergeron