Commit 6ca10653 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge remote-tracking branch 'jvgl-ce/git-http-kerberos-ce' into...

Merge remote-tracking branch 'jvgl-ce/git-http-kerberos-ce' into kerberos-spnego-git-http-controller
parents 526495fe 4bcad1cb
# This file should be identical in GitLab Community Edition and Enterprise Edition
class Projects::GitHttpController < Projects::ApplicationController class Projects::GitHttpController < Projects::ApplicationController
include ActionController::HttpAuthentication::Basic include ActionController::HttpAuthentication::Basic
include KerberosSpnegoHelper include KerberosSpnegoHelper
...@@ -149,7 +151,7 @@ class Projects::GitHttpController < Projects::ApplicationController ...@@ -149,7 +151,7 @@ class Projects::GitHttpController < Projects::ApplicationController
end end
def render_not_found def render_not_found
render text: 'Not Found', status: :not_found render plain: 'Not Found', status: :not_found
end end
def ci? def ci?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment