CE upstream 10.8.0-rc4
ALL CONFLICTS HAVE BEEN SOLVED Please confirm their resolution
Files to confirm resolution:
-
@grzesiek Please confirm resolution of (UU) .flayignore -
@grzesiek Please confirm resolution of (UU) spec/services/ci/retry_build_service_spec.rb -
@grzesiek Please confirm resolution of (UU) spec/lib/gitlab/import_export/all_models.yml -
@grzesiek Please confirm resolution of (UU) app/workers/all_queues.yml -
@grzesiek Please confirm resolution of (UU) spec/spec_helper.rb -
@DouweM Please confirm resolution of (AA) db/migrate/20180503131624_create_remote_mirrors.rb -
@DouweM Please confirm resolution of (AA) db/migrate/20180503141722_add_remote_mirror_available_overridden_to_projects.rb -
@DouweM Please confirm resolution of (AA) db/migrate/20180503193542_add_indexes_to_remote_mirror.rb -
@DouweM Please confirm resolution of (AA) db/migrate/20180503193953_add_mirror_available_to_application_settings.rb -
(UU) yarn.lock -
(UU) package.json -
@DouweM Please confirm resolution of (UU) db/schema.rb -
@mdelaossa Please confirm resolution of (UU) config/routes/group.rb -
@tiagonbotelho Please confirm resolution of (AA) app/controllers/projects/mirrors_controller.rb -
@tiagonbotelho Please confirm resolution of (UU) app/controllers/projects/settings/repository_controller.rb -
@DouweM Please confirm resolution of (UU) app/models/project.rb -
app/views/projects/pipelines/_with_tabs.html.haml -
@DouweM (@ash.mckenzie) Please confirm resolution of (UU) spec/factories/projects.rb -
@mikegreiling Please confirm resolution of (UU) app/assets/javascripts/main.js -
@mikegreiling Please confirm resolution of (UU) config/webpack.config.js -
@tiagonbotelho (@ash.mckenzie) Please confirm resolution of (UU) config/sidekiq_queues.yml -
@tiagonbotelho (@ash.mckenzie) Please confirm resolution of (UU) config/routes/project.rb -
@tiagonbotelho Please confirm resolution of(UU) lib/gitlab/usage_data.rb -
@tiagonbotelho Please confirm resolution of (UU) spec/lib/gitlab/usage_data_spec.rb -
@tiagonbotelho (@ash.mckenzie) Please confirm resolution of (UU) lib/gitlab/import_export/import_export.yml -
@tiagonbotelho (@ash.mckenzie) Please confirm resolution of (AA) app/models/remote_mirror.rb -
@tiagonbotelho (@ash.mckenzie) Please confirm resolution of (AA) app/serializers/project_mirror_entity.rb -
@tiagonbotelho (@ash.mckenzie) Please confirm resolution of (AA) app/services/concerns/exclusive_lease_guard.rb -
@tiagonbotelho (@ash.mckenzie) Please confirm resolution of (AA) app/views/admin/application_settings/_repository_mirrors_form.html.haml -
@tiagonbotelho (@ash.mckenzie) Please confirm resolution of (UU) app/views/admin/application_settings/show.html.haml -
@tiagonbotelho (@ash.mckenzie) Please confirm resolution of (UU) app/views/projects/settings/repository/show.html.haml -
@tiagonbotelho (@ash.mckenzie) Please confirm resolution of (UU) spec/models/project_spec.rb -
@tiagonbotelho (@ash.mckenzie) Please confirm resolution of (AA) spec/models/remote_mirror_spec.rb -
@tiagonbotelho (@ash.mckenzie) Please confirm resolution of (UU) spec/models/repository_spec.rb -
@matteeyah (@ash.mckenzie) Please confirm resolution of (UU) lib/gitlab/ci/pipeline/chain/command.rb -
@oswaldo (@ash.mckenzie ) Please confirm resolution of (UU) spec/javascripts/vue_mr_widget/mock_data.js -
@ayufan Please confirm resolution of (UU) app/presenters/ci/pipeline_presenter.rb -
@tiagonbotelho (@ash.mckenzie) Please confirm resolution of (AA) doc/workflow/repository_mirroring.md
Thanks in advance!
Edited by Mike Greiling