Douwe Maan 667d235091 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		2016-09-20 10:10:45 +00:00
..
api	Merge branch 'lfs-support-for-ssh-enabled' into 'master'	2016-09-20 10:10:45 +00:00
assets
backup	lib/backup: fix broken permissions when creating repo dir	2016-08-30 13:35:50 +02:00
banzai	Fix URLs with anchors in wiki	2016-09-13 23:53:40 -07:00
ci	Merge branch 'master' into per-build-token	2016-09-19 13:31:42 +02:00
container_registry	Make rubocop happy	2016-07-15 18:05:39 +02:00
gitlab	Merge branch 'lfs-support-for-ssh-enabled' into 'master'	2016-09-20 10:10:45 +00:00
json_web_token	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
omni_auth
rouge/formatters	Trim extra displayed carriage returns in diffs and files with CRLFs	2016-08-01 13:24:06 +02:00
support	Revert "Defend against 'Host' header injection"	2016-08-08 13:02:44 +02:00
tasks	Improve .haml-lint.yml, simplify the haml_lint task and remove CHANGELOG entry	2016-09-13 18:56:00 +02:00
banzai.rb	Object renderer read_multi rendered entries from Cache	2016-07-12 14:35:29 +02:00
disable_email_interceptor.rb	Enable Style/EmptyLines cop, remove redundant ones	2016-07-01 21:56:17 +02:00
event_filter.rb	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
expand_variables.rb	Update support for dynamic environments	2016-09-19 10:07:13 +02:00
extracts_path.rb	Restore get_id in ExtractsPath	2016-08-24 12:54:16 +02:00
file_size_validator.rb
file_streamer.rb
gitlab.rb	Update Gitlab.com? to support staging	2016-06-27 15:10:36 -04:00
gt_one_coercion.rb
repository_cache.rb	Use project ID in repository cache to prevent stale data from persisting across projects	2016-07-25 05:09:28 -07:00
static_model.rb
unfold_form.rb
uploaded_file.rb	Enable Style/EmptyLines cop, remove redundant ones	2016-07-01 21:56:17 +02:00
version_check.rb