Skip to content

CE upstream

Valery Sizov requested to merge ce-upstream into master

Unresolved conflicts

both modified:   app/controllers/omniauth_callbacks_controller.rb
both modified:   app/views/shared/issuable/_sidebar.html.haml

Merge request reports