diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-09-29 07:27:08 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-09-29 07:27:08 +0000 |
| commit | 231ee19c81d2491e3b5648647bf19992c6b56d83 (patch) | |
| tree | 793ac8a580e3943928887673dedd014d10174caf /doc/gitlab-basics/add-merge-request.md | |
| parent | 5b7e491c393f3ba436e45454a58709f6d70bbc5c (diff) | |
| parent | 7d2655aae78604f8cc09e961868d520b23c102ce (diff) | |
| download | gitlab-ce-231ee19c81d2491e3b5648647bf19992c6b56d83.tar.gz | |
Merge branch 'krb_auth_helper_ce' into 'master'
Remove 'kerberos' from auth_helper.rb for gitlab-CE.
There is no Kerberos auth in gitlab-ce, so it shouldn't be noted
as a form-driven auth mechanism in app/helpers/auth_helper.rb.
This breaks using Kerberos as a custom omniauth provider.
See issue #2510 (https://gitlab.com/gitlab-org/gitlab-ce/issues/2510).
@DouweM suggested I send in this merge request.
See merge request !1430
Diffstat (limited to 'doc/gitlab-basics/add-merge-request.md')
0 files changed, 0 insertions, 0 deletions