CE upstream - 2018-11-22 16:22 UTC
Files to resolve:
-
@gtsiolis Please resolve (UU) .gitlab-ci.yml
-
@jprovaznik Please resolve (UU) db/migrate/20161007073613_create_user_activities.rb
-
@jprovaznik Please resolve (UU) db/post_migrate/20161128170531_drop_user_activities_table.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-11-22
branch.
Thanks in advance!
@jprovaznik 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 Jan Provaznik