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
..
api	Merge branch 'dz-merge-request-version'	2016-08-25 12:59:21 -05:00
assets
backup	Use File::exist? instead of File::exists?	2016-08-11 13:54:45 +03:00
banzai	Fix a memory leak caused by Banzai::Filter::SanitizationFilter	2016-08-14 22:28:18 +02:00
ci	Add Sentry logging to API calls	2016-08-24 12:09:51 -07:00
container_registry	Make rubocop happy	2016-07-15 18:05:39 +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
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	Use File::exist? instead of File::exists?	2016-08-11 13:54:45 +03: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
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