CE upstream - Wednesday
Files to resolve:
-
@winhPlease resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/04196d4cd33ab562cd540c21b90e54fabc0adf76/app/assets/javascripts/boards/boards_bundle.js (UU) -
@rymaiPlease resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/04196d4cd33ab562cd540c21b90e54fabc0adf76/app/finders/issuable_finder.rb (UU) -
@grzesiekPlease resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/04196d4cd33ab562cd540c21b90e54fabc0adf76/app/services/ci/create_pipeline_service.rb (UU) -
@winhPlease resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/04196d4cd33ab562cd540c21b90e54fabc0adf76/app/views/shared/boards/_show.html.haml (UU) -
@axilPlease resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/04196d4cd33ab562cd540c21b90e54fabc0adf76/doc/user/project/integrations/kubernetes.md (UU)
Once the conflicts resolved, please push (no force-push!) to the ce-to-ee-2017-09-27 branch.
Thanks in advance!
Note: This merge request was created by an experimental script, it's not perfect (yet)!
Edited by Grzegorz Bizon