CE Upstream - Monday
-
@zj please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/.gitlab-ci.yml -
@jarka please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/CHANGELOG.md -
@annabeldunstone please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/stylesheets/framework/common.scss -
@annabeldunstone please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/stylesheets/pages/merge_requests.scss -
@annabeldunstone please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/stylesheets/pages/pipelines.scss -
@winh please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/models/group.rb -
@jameslopez please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/services/applications/create_service.rb
Once the conflicts resolved, please push (no force-push!) to the ce-to-ee
branch.
People mentioned here are picked by git log -1 -- FILENAME
. If you are wrong person to resolve the conflict - please ping me.
Thanks for help!
Edited by Annabel Dunstone Gray