diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-07-01 22:24:49 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-07-01 22:24:49 +0000 |
| commit | fc3402b7eaa9e9839ac2b7087d9582f518b0bf96 (patch) | |
| tree | e3f4cd223ebdd3a17614aba74e997043e966326d /app/helpers | |
| parent | d1c94f034bbf688248f46482b941fe673940c6b0 (diff) | |
| parent | 4bcad1cbddca92e27c19a1c6c0872a01ef318f69 (diff) | |
| download | gitlab-ce-fc3402b7eaa9e9839ac2b7087d9582f518b0bf96.tar.gz | |
Merge branch 'git-http-kerberos-ce' into 'master'
Groundwork for Kerberos SPNEGO (EE feature)
Refactor Projecst::GitHttpController to allow Kerberos integration in GitLab EE.
Companion to https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/509
See merge request !5037
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/kerberos_spnego_helper.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/app/helpers/kerberos_spnego_helper.rb b/app/helpers/kerberos_spnego_helper.rb new file mode 100644 index 00000000000..f5b0aa7549a --- /dev/null +++ b/app/helpers/kerberos_spnego_helper.rb @@ -0,0 +1,9 @@ +module KerberosSpnegoHelper + def allow_basic_auth? + true # different behavior in GitLab Enterprise Edition + end + + def allow_kerberos_spnego_auth? + false # different behavior in GitLab Enterprise Edition + end +end |