app/controllers/omniauth_callbacks_controller.rb · 4e7d3451393229071e892a1a577a261d008ca698 · nexedi / gitlab-ce · GitLab

Find file Blame History Permalink

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-22 · cab5f1f1
GitLab Bot authored Jun 22, 2018
```
# Conflicts:
#	doc/topics/autodevops/index.md

[ci skip]
```
cab5f1f1

omniauth_callbacks_controller.rb 5.32 KB