CE Upstream - Wednesday
Resolved conflicts:
.gitlab-ci.yml
VERSION
app/assets/stylesheets/pages/boards.scss
app/views/projects/merge_requests/widget/open/_accept.html.haml
config/webpack.config.js
lib/api/merge_requests.rb
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Resolved conflicts:
.gitlab-ci.yml
VERSION
app/assets/stylesheets/pages/boards.scss
app/views/projects/merge_requests/widget/open/_accept.html.haml
config/webpack.config.js
lib/api/merge_requests.rb