CE upstream
Unresolved conflicts
both modified: app/controllers/omniauth_callbacks_controller.rb
both modified: app/views/shared/issuable/_sidebar.html.haml
Unresolved conflicts
both modified: app/controllers/omniauth_callbacks_controller.rb
both modified: app/views/shared/issuable/_sidebar.html.haml