summaryrefslogtreecommitdiff
path: root/app/controllers/omniauth_callbacks_controller.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-06-05 13:34:25 +0200
committerDouwe Maan <douwe@gitlab.com>2015-06-05 13:34:25 +0200
commit3f59a8f0be101c2405372d05a304540beb1b6d01 (patch)
tree60db46574ab7f6c238ac8b0bd1a9ee5eee31628b /app/controllers/omniauth_callbacks_controller.rb
parent214f38c4223091ce37d41582feacae09120db5d9 (diff)
parent45e9150a517970d3782bed642b091ad60a46634f (diff)
downloadgitlab-ce-3f59a8f0be101c2405372d05a304540beb1b6d01.tar.gz
Merge branch 'cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth'
Diffstat (limited to 'app/controllers/omniauth_callbacks_controller.rb')
0 files changed, 0 insertions, 0 deletions