CE upstream - 2018-04-05 12:27 UTC
Files to resolve:
-
@grzesiek Please resolve (UU) db/schema.rb
-
@MadLittleMods Please resolve (UU) doc/administration/index.md
-
@MadLittleMods Please resolve (AA) doc/user/admin_area/settings/email.md
-
@MadLittleMods Please resolve (UU) spec/mailers/previews/notify_preview.rb
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!
@MadLittleMods 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 Eric Eastwood