CE upstream - 2018-02-02 18:24 UTC
Files to resolve:
-
@mdelaossa Please resolve (UU) app/models/group.rb
-
Micaël Bergeron Please resolve (UU) app/models/upload.rb
-
@smcgivern Please resolve (UU) app/services/merge_requests/build_service.rb
-
Micaël Bergeron Please resolve (UU) app/uploaders/attachment_uploader.rb
-
Micaël Bergeron Please resolve (UU) app/uploaders/avatar_uploader.rb
-
Micaël Bergeron Please resolve (UU) app/uploaders/file_uploader.rb
-
Micaël Bergeron Please resolve (UU) app/uploaders/gitlab_uploader.rb
-
Micaël Bergeron Please resolve (UU) app/uploaders/job_artifact_uploader.rb
-
Micaël Bergeron Please resolve (UU) app/uploaders/legacy_artifact_uploader.rb
-
Micaël Bergeron Please resolve (UU) app/uploaders/lfs_object_uploader.rb
-
Micaël Bergeron Please resolve (UU) app/uploaders/namespace_file_uploader.rb
-
Micaël Bergeron Please resolve (UU) app/uploaders/personal_file_uploader.rb
-
@axil Please resolve (UU) config/gitlab.yml.example
-
@jameslopez Please resolve (UU) config/initializers/1_settings.rb
-
Micaël Bergeron Please resolve (UU) spec/controllers/projects/artifacts_controller_spec.rb
-
Micaël Bergeron Please resolve (UU) spec/controllers/projects/raw_controller_spec.rb
-
Micaël Bergeron Please resolve (UU) spec/factories/groups.rb
-
Micaël Bergeron Please resolve (UU) spec/uploaders/attachment_uploader_spec.rb
-
Micaël Bergeron Please resolve (UU) spec/uploaders/avatar_uploader_spec.rb
-
Micaël Bergeron Please resolve (UU) spec/uploaders/file_uploader_spec.rb
-
@nick.thomas Please resolve (UU) spec/uploaders/job_artifact_uploader_spec.rb
-
Micaël Bergeron Please resolve (UU) spec/uploaders/legacy_artifact_uploader_spec.rb
-
Micaël Bergeron Please resolve (UU) spec/uploaders/lfs_object_uploader_spec.rb
-
Micaël Bergeron Please resolve (UU) spec/uploaders/namespace_file_uploader_spec.rb
-
Micaël Bergeron Please resolve (UU) spec/uploaders/personal_file_uploader_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-02-02
branch.
Thanks in advance!
@jameslopez 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 Micaël Bergeron