CE upstream - 2018-06-05 21:46 UTC
Files to resolve:
-
@blackst0ne Please resolve (UU) Gemfile.rails5.lock
-
@ClemMakesApps Please resolve (UU) app/assets/stylesheets/bootstrap_migration.scss
-
@grzesiek Please resolve (UU) app/models/ci/pipeline.rb
-
@smcgivern Please resolve (UU) app/models/personal_snippet.rb
-
@mdelaossa Please resolve (UU) app/services/application_settings/update_service.rb
-
@lulalala Please resolve (UU) db/schema.rb
-
@axil Please resolve (UU) doc/user/project/import/github.md
-
@lulalala Please resolve (UU) locale/gitlab.pot
-
@grzesiek Please resolve (UU) spec/serializers/pipeline_serializer_spec.rb
-
@ayufan Please resolve (UU) spec/uploaders/object_storage_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-06-05
branch.
Thanks in advance!
@grzesiek 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 Grzegorz Bizon