CE Upstream - Monday
-
@iamphill please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/javascripts/dispatcher.js -
@filipa please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/javascripts/project.js -
@filipa please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/assets/javascripts/project_new.js -
@fjsanpedro please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/controllers/application_controller.rb -
@fjsanpedro please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/app/views/admin/application_settings/_form.html.haml -
@fjsanpedro please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/lib/api/api_guard.rb -
@fjsanpedro please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/lib/gitlab/auth/user_auth_finders.rb -
@fjsanpedro please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/lib/gitlab/git/wiki.rb -
@fjsanpedro please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/lib/gitlab/auth/user_auth_finders_spec.rb -
@reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/lib/gitlab/background_migration/populate_fork_networks_range_spec.rb -
@fjsanpedro please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee/spec/requests/api/helpers_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 Filipa Lacerda