CE upstream - Friday
Files to resolve:
-
LUKE BENNETT Please resolve (UU) app/assets/javascripts/boards/boards_bundle.js -
@MadLittleMods Please resolve (UU) app/assets/javascripts/boards/services/board_service.js -
@timzallmann Please resolve (UU) app/assets/javascripts/ide/components/repo_file.vue -
@timzallmann Please resolve (UU) app/assets/javascripts/ide/components/repo_tab.vue -
@dbalexandre Please resolve (UU) app/models/project.rb -
@mayra-cabrera Please resolve (UU) app/models/service.rb -
@oswaldo Please resolve (UU) app/serializers/merge_request_widget_entity.rb -
@eReGeBe Please resolve (UU) lib/gitlab/git/repository.rb -
@godfat Please resolve (UU) spec/controllers/projects/artifacts_controller_spec.rb -
@dbalexandre Please resolve (UU) spec/lib/gitlab/bare_repository_import/importer_spec.rb -
@eReGeBe Please resolve (UU) spec/lib/gitlab/git/repository_spec.rb -
@dbalexandre Please resolve (UU) spec/models/namespace_spec.rb -
@dbalexandre Please resolve (UU) spec/models/project_spec.rb -
@mayra-cabrera Please resolve (UU) spec/models/service_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-01-05 branch.
Thanks in advance!
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 Luke Bennett