CE upstream - 2018-10-30 14:22 UTC
Files to resolve:
-
@psimyn Please resolve (UU) app/assets/stylesheets/pages/builds.scss
-
@psimyn Please resolve (UU) app/views/layouts/header/_default.html.haml
-
@jprovaznik Please resolve (AA) lib/gitlab/background_migration/redact_links.rb
-
Marcel Amirault Please resolve (UU) spec/models/ci/build_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-10-30
branch.
Thanks in advance!
@psimyn 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 Thong Kuah