CE upstream - Friday (!1651) · Merge requests · GitLab.org / GitLab · GitLab

Do not update/delete: Banner broadcast message test data

Do not update/delete: Notification broadcast message test data

username-removed-128633 requested to merge ce-to-ee-2017-04-14 into master Apr 14, 2017

Files to resolve:

@alfredo1 Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/3570d4bd2c54a037f10fb9b531d593f6eedbe1a0/app/assets/javascripts/boards/components/modal/footer.js
@alfredo1 Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/3570d4bd2c54a037f10fb9b531d593f6eedbe1a0/app/assets/javascripts/boards/components/sidebar/remove_issue.js
@alfredo1 Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/3570d4bd2c54a037f10fb9b531d593f6eedbe1a0/app/assets/javascripts/boards/stores/boards_store.js
@alfredo1 Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/3570d4bd2c54a037f10fb9b531d593f6eedbe1a0/spec/javascripts/lib/utils/text_utility_spec.js

Once the conflicts resolved, please push (no force-push!) to the ce-to-ee-2017-04-14 branch.

Thanks in advance! ❤️