summaryrefslogtreecommitdiff
path: root/app/serializers
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-11-02 11:51:50 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2018-11-02 11:51:50 +0000
commit74c79123248f35db64db2a6612a2794810f555db (patch)
tree8351c7c4085879aab2694ee2ac99b9b988ac174a /app/serializers
parent9b1a112cb3c26f0cd01b1db7ae80d9b940f2b5b1 (diff)
parent69b9a879a12e3eeaae1394534247c97e5ad14495 (diff)
downloadgitlab-ce-74c79123248f35db64db2a6612a2794810f555db.tar.gz
Merge branch 'ce-jej/group-saml-discovery-token' into 'master'
TokenAuthenticatable allows non-unique tokens See merge request gitlab-org/gitlab-ce!22748
Diffstat (limited to 'app/serializers')
0 files changed, 0 insertions, 0 deletions