CE upstream - 2018-05-04 21:23 UTC
Files to resolve:
-
@tiagonbotelho Please resolve (UU) app/controllers/import/base_controller.rb -
@tiagonbotelho Please resolve (AA) app/models/project_import_state.rb -
@tiagonbotelho Please resolve (UU) db/schema.rb -
@tiagonbotelho Please resolve (AA) lib/gitlab/background_migration/populate_import_state.rb -
@tiagonbotelho Please resolve (AA) lib/gitlab/background_migration/rollback_import_state_data.rb -
@tiagonbotelho Please resolve (UU) lib/gitlab/legacy_github_import/importer.rb -
@tiagonbotelho Please resolve (AA) spec/factories/import_state.rb -
@tiagonbotelho Please resolve (UU) spec/factories/projects.rb -
@tiagonbotelho Please resolve (AA) spec/lib/gitlab/background_migration/populate_import_state_spec.rb -
@tiagonbotelho Please resolve (AA) spec/lib/gitlab/background_migration/rollback_import_state_data_spec.rb -
@tiagonbotelho Please resolve (UU) spec/lib/gitlab/import_export/all_models.yml -
@tiagonbotelho Please resolve (AA) spec/migrations/migrate_import_attributes_data_from_projects_to_project_mirror_data_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-05-04 branch.
Thanks in advance!
@tiagonbotelho 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 Tiago Botelho