CE upstream - 2018-08-10 15:22 UTC
Files to resolve:
-
@filipa Please resolve (UU) app/assets/javascripts/reports/components/issues_list.vue
-
@filipa Please resolve (UU) app/assets/javascripts/reports/components/report_issues.vue
-
gfyoung Please resolve (UU) app/models/project_services/hipchat_service.rb
-
@mayra-cabrera Please resolve (UU) app/serializers/environment_entity.rb
-
@mayra-cabrera Please resolve (AA) app/services/ci/enqueue_build_service.rb
-
@lbennett Please resolve (UU) app/views/projects/mirrors/_instructions.html.haml
-
@lbennett Please resolve (AA) app/views/projects/mirrors/_mirror_repos.html.haml
-
@lbennett Please resolve (AA) app/views/projects/mirrors/_mirror_repos_form.html.haml
-
@mayra-cabrera 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-10
branch.
Thanks in advance!
@lbennett 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 Dmytro Zaporozhets (DZ)