summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-06-09 15:01:10 +0000
committerDouwe Maan <douwe@gitlab.com>2016-06-09 15:01:10 +0000
commit3803b380b43af2bdb20dced27fce79511dfb2897 (patch)
tree03d357c03a6b6827fd18f63d1011d3994a919d04 /.github
parent30ee4ea6659c91ac6a249d700a9fcdd266676942 (diff)
parentbf63964b4d1f42f7f091e25c81b87a1ddb110cba (diff)
downloadgitlab-ce-3803b380b43af2bdb20dced27fce79511dfb2897.tar.gz
Merge branch 'fix-git-http-routing' into 'master'
Ensure only IDs ending in .git perform git actions ## What does this MR do? Rails's routing is pretty strange. Previously, `GET /namespace/project/info/refs` would go to the Git HTTP controller (if the redirect for that case was taken out). ## Are there points in the code the reviewer needs to double check? The specs fail if the redirect is moved to above the Git HTTP routes, removed altogether, or the Git HTTP constraints are changed. But there might still be missing cases. ## Why was this MR needed? The master build and HTTP cloning were both broken. ## What are the relevant issue numbers? Closes #18376. ## Screenshots (if relevant) Nope. ## Does this MR meet the acceptance criteria? - [x] [not needed] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [not needed] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] (not needed) API support added - [ ] Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4558
Diffstat (limited to '.github')
0 files changed, 0 insertions, 0 deletions