CE upstream - 2018-08-03 18:21 UTC
Files to resolve:
-
@dennis Please resolve (UU) app/assets/stylesheets/framework/mixins.scss
-
@vsizov Please resolve (UU) app/services/projects/hashed_storage/migrate_attachments_service.rb
-
@vsizov Please resolve (UU) app/services/projects/hashed_storage/migrate_repository_service.rb
-
@vsizov Please resolve (UU) app/services/projects/update_service.rb
-
@leipert Please resolve (UU) locale/gitlab.pot
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-08-03
branch.
Thanks in advance!
@vsizov 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 Lukas 'ai-pi' Eipert