summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2015-10-14 11:12:21 +0200
committerGitLab <example@example.com>2015-10-14 11:14:43 +0200
commit033a879cc96c6210175f03f72547d05a2946c0bb (patch)
treee4dcbbde6c582a782c8dc7906a566cbca7375cba
parentcb13980db88c1d1ae8a5cd766ced4629c657010b (diff)
downloadgitlab-ce-033a879cc96c6210175f03f72547d05a2946c0bb.tar.gz
Fix NGINX API download regex
Users are allowed to supply namespace%2Fproject instead of a numeric ID
-rw-r--r--lib/support/nginx/gitlab2
-rw-r--r--lib/support/nginx/gitlab-ssl2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab
index ffc0eb0585c..1e55c5a0486 100644
--- a/lib/support/nginx/gitlab
+++ b/lib/support/nginx/gitlab
@@ -125,7 +125,7 @@ server {
return 418;
}
- location ~ ^/api/v3/projects/[0-9]+/repository/archive {
+ location ~ ^/api/v3/projects/.*/repository/archive {
# 'Error' 418 is a hack to re-use the @gitlab-git-http-server block
error_page 418 = @gitlab-git-http-server;
return 418;
diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl
index c2e9f8864f8..08641bbcc17 100644
--- a/lib/support/nginx/gitlab-ssl
+++ b/lib/support/nginx/gitlab-ssl
@@ -172,7 +172,7 @@ server {
return 418;
}
- location ~ ^/api/v3/projects/[0-9]+/repository/archive {
+ location ~ ^/api/v3/projects/.*/repository/archive {
# 'Error' 418 is a hack to re-use the @gitlab-git-http-server block
error_page 418 = @gitlab-git-http-server;
return 418;