summaryrefslogtreecommitdiff
path: root/lib/api/helpers
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-12-16 16:01:32 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-12-16 16:01:32 +0000
commitfdc944e0b47c67c76cd38b95e1c10c862c77acc6 (patch)
tree6063b7867646ea48ba515586d949f4b3b4eb8bb1 /lib/api/helpers
parent01adeb17acccab09eb0074725050356d9d431c8a (diff)
parent55f224e4e785d0e1515ac4a840e689cb6d9c7d24 (diff)
downloadgitlab-ce-fdc944e0b47c67c76cd38b95e1c10c862c77acc6.tar.gz
Merge branch 'add_info_to_qr' into 'master'
Add GitLab host to 2FA QR and manual info Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25545 See merge request !6941
Diffstat (limited to 'lib/api/helpers')
0 files changed, 0 insertions, 0 deletions