CE upstream - Wednesday
Files to resolve:
-
@filipa Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2f0dba9287e4afed7bf9e096d7b75eaef7dad314/app/assets/javascripts/label_manager.js (UU) -
@filipa Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2f0dba9287e4afed7bf9e096d7b75eaef7dad314/app/assets/javascripts/main.js (UU) -
@filipa Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2f0dba9287e4afed7bf9e096d7b75eaef7dad314/app/assets/javascripts/star.js (UU) -
Vitaliy @blackst0ne Klachkov Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2f0dba9287e4afed7bf9e096d7b75eaef7dad314/app/controllers/projects_controller.rb (UU) -
@annabeldunstone Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2f0dba9287e4afed7bf9e096d7b75eaef7dad314/app/views/projects/project_members/index.html.haml (UU) -
@rymai Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2f0dba9287e4afed7bf9e096d7b75eaef7dad314/doc/development/README.md (UU) -
@rymai Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2f0dba9287e4afed7bf9e096d7b75eaef7dad314/doc/development/testing_guide/testing_levels.md (AA) -
@victorwu Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2f0dba9287e4afed7bf9e096d7b75eaef7dad314/doc/user/permissions.md (UU) -
@nick.thomas Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2f0dba9287e4afed7bf9e096d7b75eaef7dad314/spec/helpers/groups_helper_spec.rb (UU) -
@rymai Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/2f0dba9287e4afed7bf9e096d7b75eaef7dad314/spec/mailers/notify_spec.rb (UU)
Once the conflicts resolved, please push (no force-push!) to the ce-to-ee-2017-10-11
branch.
Thanks in advance!
Note: This merge request was created by an experimental script, it's not perfect (yet)!
Edited by Filipa Lacerda