CE Upstream - Monday
-
@dzaporozhets please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/CHANGELOG.md -
@dzaporozhets please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/Gemfile.lock -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/javascripts/locale/de/app.js -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/javascripts/locale/en/app.js -
@nick.thomas please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/controllers/concerns/membership_actions.rb -
@dzaporozhets please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/controllers/projects/deploy_keys_controller.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/helpers/button_helper.rb -
@DouweM please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/helpers/projects_helper.rb -
@yorickpeterse please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/models/project.rb -
@iamphill please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/services/boards/create_service.rb -
@vsizov please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/services/slash_commands/interpret_service.rb -
@to1ne please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/help/index.html.haml -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/projects/commits/_head.html.haml -
@dzaporozhets please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/projects/project_members/_index.html.haml -
@dzaporozhets please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/projects/project_members/_new_project_member.html.haml -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/shared/_clone_panel.html.haml -
@dzaporozhets please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/db/schema.rb -
@axil please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/doc/ci/triggers/README.md -
@to1ne please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/lib/gitlab.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/locale/de/gitlab.po -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/locale/en/gitlab.po -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/locale/gitlab.pot -
@timzallmann please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/features/admin/admin_groups_spec.rb -
@ClemMakesApps please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/features/issues/form_spec.rb -
@DouweM please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/features/projects/blobs/blob_show_spec.rb -
@to1ne please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/views/help/index.html.haml_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 Dmytro Zaporozhets (DZ)