CE upstream: Friday (!2999) · 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-423915 requested to merge ce-to-ee-2017-09-22 into master Sep 22, 2017

CONFLICT (content): Merge conflict in doc/topics/autodevops/index.md
CONFLICT (content): Merge conflict in config/webpack.config.js
CONFLICT (content): Merge conflict in app/views/shared/boards/_show.html.haml
CONFLICT (content): Merge conflict in app/helpers/system_note_helper.rb