diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-05 22:08:29 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-05 22:08:29 +0000 |
| commit | 9e041f2185ecb957e1f3d1205ea3bac54a5eb803 (patch) | |
| tree | 4dfdfc2ae250c90138c272429341af53f53eb7af /app/controllers | |
| parent | cc9edff6dcc4b73aa20683dee6021d6693533743 (diff) | |
| parent | 8bc381db90c92bca6ba868d1588af1ad1a41073b (diff) | |
| download | gitlab-ce-9e041f2185ecb957e1f3d1205ea3bac54a5eb803.tar.gz | |
Merge branch '29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-gitlab-ce' into 'master'
Generate and handle a gl_repository param to pass around components
Closes #29925
See merge request !10992
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/git_http_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb index 10adddb4636..9e4edcae101 100644 --- a/app/controllers/projects/git_http_controller.rb +++ b/app/controllers/projects/git_http_controller.rb @@ -59,7 +59,7 @@ class Projects::GitHttpController < Projects::GitHttpClientController def render_ok set_workhorse_internal_api_content_type - render json: Gitlab::Workhorse.git_http_ok(repository, user, action_name) + render json: Gitlab::Workhorse.git_http_ok(repository, wiki?, user, action_name) end def render_http_not_allowed |