CE upstream - 2018-06-13 09:24 UTC
Files to resolve:
-
@dennis Please resolve (UU) app/views/admin/application_settings/_account_and_limit.html.haml
-
@dennis Please resolve (UU) app/views/admin/application_settings/_ci_cd.html.haml
-
@dennis Please resolve (UU) app/views/admin/application_settings/_email.html.haml
-
@dennis Please resolve (UU) app/views/admin/application_settings/_help_page.html.haml
-
@dennis Please resolve (UU) app/views/admin/application_settings/_repository_mirrors_form.html.haml
-
@dennis Please resolve (UU) app/views/admin/application_settings/_signup.html.haml
-
@dennis Please resolve (UU) app/views/admin/application_settings/_visibility_and_access.html.haml
-
@fjsanpedro Please resolve (UU) lib/api/users.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-06-13
branch.
Thanks in advance!
@dennis 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