Robert Speicher 75ed0e27d9 Merge branch '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data' into 'master' ... Handle non-UTF-8 conflicts gracefully ## What does this MR do? If a conflict file isn't in a UTF-8-compatible encoding, we can't resolve it in the UI. ## What are the relevant issue numbers? Closes #21247. See merge request !5961		2016-08-25 19:08:38 +00:00
..
banzai	Merge branch 'relative-link-filter-ref' into 'master'	2016-08-09 21:45:59 +00:00
ci	Fix test failures, that did occur because of missing previously used `reload_status!` call	2016-08-11 22:54:25 +02:00
container_registry	Explicitly remove authorization token and make sure that invalid addresses are properly handled	2016-07-15 17:35:23 +02:00
gitlab	Merge branch '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data' into 'master'	2016-08-25 19:08:38 +00:00
json_web_token	…
disable_email_interceptor_spec.rb	adds second batch of tests changed to active tense	2016-08-09 15:11:39 +01:00
extracts_path_spec.rb	Add failing test for #21334	2016-08-24 02:18:38 +02:00
file_size_validator_spec.rb	…
git_ref_validator_spec.rb	…
gitlab_spec.rb	…
repository_cache_spec.rb	Use project ID in repository cache to prevent stale data from persisting across projects	2016-07-25 05:09:28 -07:00