CE Upstream - Monday
-
@smcgivern please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/finders/issuable_finder.rb -
@smcgivern please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/helpers/issuables_helper.rb -
@iamphill please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/projects/issues/_nav_btns.html.haml -
@smcgivern please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/finders/issues_finder_spec.rb -
@iamphill please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/helpers/groups_helper_spec.rb -
Adam Niedzielski please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/services/git_push_service_spec.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 Sean McGivern