CE upstream
Unresolved conflicts
both modified: app/controllers/omniauth_callbacks_controller.rb
both modified: app/views/shared/issuable/_sidebar.html.haml
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Unresolved conflicts
both modified: app/controllers/omniauth_callbacks_controller.rb
both modified: app/views/shared/issuable/_sidebar.html.haml