diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-09-20 10:10:45 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-09-20 10:10:45 +0000 |
| commit | 667d2350911b2c3cca0545897eb67fda4b7d4b80 (patch) | |
| tree | 9357cf7a9703fc5dd72a345fcc15255de22d8334 /config | |
| parent | 95b9421ad3b2678da6e0af0131eafd52cdd0b2a5 (diff) | |
| parent | 795acf2e4e01f7ddf3a8be73ddc119b4d84a03e3 (diff) | |
| download | gitlab-ce-667d2350911b2c3cca0545897eb67fda4b7d4b80.tar.gz | |
Merge branch 'lfs-support-for-ssh-enabled' into 'master'
LFS support for ssh enabled
## What does this MR do?
This is follow-up after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043 which is falsely shown as merged due to: https://gitlab.com/gitlab-org/gitlab-ce/issues/22334
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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)
## What are the relevant issue numbers?
See merge request !6413
Diffstat (limited to 'config')
0 files changed, 0 insertions, 0 deletions