summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2015-06-26 08:55:31 +0000
committerMarin Jankovski <marin@gitlab.com>2015-06-26 08:55:31 +0000
commitc342a9abccf27471a631c047b01911a242ce1106 (patch)
treeee491974c1ca4831def71b3bebb2114eb67a2dc8 /lib/api
parent6288677134d0e6d1f805748bc557091ad4747bd9 (diff)
parent024e854eca2df3e1d49e1c3cdf39774e4e467b87 (diff)
downloadgitlab-ce-c342a9abccf27471a631c047b01911a242ce1106.tar.gz
Merge branch 'SAML_1888' into 'master'
Add SAML to list of social_provider Resolves issue 1888. Still an issue because the SAML link under Connected Accounts will not have a logo. See merge request !891
Diffstat (limited to 'lib/api')
0 files changed, 0 insertions, 0 deletions