Rémy Coutable 1ca1ebc09b Merge branch 'registry-500-fix' into 'master' ... Properly support application/json in Container Registry ## What does this MR do? When requesting tags a `application/json` is used by `docker/distribution`. ## Why was this MR needed? Fixes regression introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4669 ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18736 See merge request !4742		2016-06-17 17:06:55 +00:00
..
banzai	Merge branch 'banzai-issue-filter-queries' into 'master'	2016-06-16 20:49:13 +00:00
ci	Merge branch 'fix/error-when-job-variables-not-defined-but-specified' into 'master'	2016-06-17 15:10:06 +00:00
container_registry	Fix regression introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4669	2016-06-17 13:24:50 +02:00
gitlab	Merge branch 'secure-request-uris' into 'master'	2016-06-17 16:43:14 +00:00
json_web_token	Revert "Fix merge conflicts - squashed commit"	2016-06-03 11:10:17 +02:00
disable_email_interceptor_spec.rb	Fix failing EmailOnPush spec.	2016-06-10 14:11:02 +05:30
extracts_path_spec.rb	Added & use Gitlab::Routing for URL helpers	2016-04-01 11:13:48 +02:00
file_size_validator_spec.rb	Tag lib specs	2015-12-09 11:55:42 +01:00
git_ref_validator_spec.rb	Tag lib specs	2015-12-09 11:55:42 +01:00
gitlab_spec.rb	Add Gitlab.com? method	2016-04-12 17:30:11 -04:00
repository_cache_spec.rb	Tag lib specs	2015-12-09 11:55:42 +01:00