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
..
backend	Create (if necessary) and link the gitlab-shell secret file on the rake install task	2016-06-29 22:30:33 -04:00
badge	Render coverage badge for latest successful pipeline	2016-08-18 16:30:43 +02:00
bitbucket_import	Fix spec to set import_url before attempting to create import_data	2016-07-17 20:57:11 -07:00
checks	Change the order of the access rules to check simpler first, and add specs	2016-08-12 18:27:42 -04:00
ci	Memoize CI config node validator to prevent leaks	2016-08-09 11:29:32 +02:00
conflict	Handle non-UTF-8 conflicts gracefully	2016-08-25 08:27:08 +01:00
data_builder	Simplify the name for data builder, feedback:	2016-08-12 16:09:29 +08:00
database	Fix spec Don't attempt to disable statement timeout on a MySQL DB	2016-07-14 20:55:33 -07:00
diff	Fix line commenting for the initial commit	2016-08-19 16:35:44 +01:00
downtime_check	Better formatting for downtime check messages	2016-08-17 12:15:20 +02:00
email	Disable “issue by email” feature until it uses a different token	2016-08-19 19:49:12 -05:00
fogbugz_import	Enable Style/EmptyLines cop, remove redundant ones	2016-07-01 21:56:17 +02:00
gfm
git	Enable some Rubocop cops related to new lines	2016-08-03 12:02:41 +02:00
github_import	Add readable error message when remote data could not be fully imported	2016-08-24 12:17:13 -03:00
gitlab_import	Stub omniauth provider for GitLab	2016-07-13 11:35:38 -03:00
google_code_import	Enable Style/EmptyLines cop, remove redundant ones	2016-07-01 21:56:17 +02:00
graphs
import_export	Fix attribute inclusion in import/export config ignored in some cases	2016-08-11 12:49:07 +02:00
ldap	adds second batch of tests changed to active tense	2016-08-09 15:11:39 +01:00
metrics	Adds response mime type to transaction metric action when it's not HTML	2016-08-25 16:33:41 +02:00
middleware	Fix typo in gitlab-workhorse header	2016-08-19 12:25:52 +02:00
o_auth	adds second batch of tests changed to active tense	2016-08-09 15:11:39 +01:00
saml	adds second batch of tests changed to active tense	2016-08-09 15:11:39 +01:00
sanitizers
sherlock
slash_commands	Fix behavior around commands with optional arguments	2016-08-18 14:29:49 -05:00
sql
template	Load issues and merge requests templates from repository	2016-08-16 15:50:17 -03:00
asciidoc_spec.rb	adds second batch of tests changed to active tense	2016-08-09 15:11:39 +01:00
auth_spec.rb	adds second batch of tests changed to active tense	2016-08-09 15:11:39 +01:00
award_emoji_spec.rb	Fix emoji paths in relative root configurations	2016-07-01 09:10:12 -07:00
blame_spec.rb
changes_list_spec.rb	api for generating new merge request	2016-08-11 23:37:00 +07:00
closing_issue_extractor_spec.rb	Don’t close issues on original project from a fork	2016-08-04 12:38:08 +02:00
color_schemes_spec.rb
current_settings_spec.rb	Handle case when Redis cache returns an empty setting	2016-06-29 14:28:41 -07:00
database_spec.rb
downtime_check_spec.rb	Added checks for migration downtime	2016-07-20 12:41:56 +02:00
exclusive_lease_spec.rb
git_access_spec.rb	Fix ArgumentError in GitAccess specs	2016-08-04 15:22:34 +02:00
git_access_wiki_spec.rb	Rename ENV['PROTOCOL'] to ENV['GL_PROTOCOL'] to conform to what GitLab Shell expects and make the protocol param in GitAccess mandatory.	2016-07-05 16:54:22 -05:00
highlight_spec.rb	Fix specs	2016-08-01 13:24:06 +02:00
incoming_email_spec.rb
key_fingerprint_spec.rb
lazy_spec.rb
markup_helper_spec.rb
metrics_spec.rb	Tracking of custom events	2016-08-17 10:04:04 +02:00
popen_spec.rb	Enable Style/UnneededCapitalW Rubocop cop	2016-06-30 13:31:52 +02:00
project_search_results_spec.rb	adds second batch of tests changed to active tense	2016-08-09 15:11:39 +01:00
redis_spec.rb	Removed extra newline from redis_spec.rb	2016-08-10 13:05:41 +02:00
reference_extractor_spec.rb
regex_spec.rb
search_results_spec.rb	adds second batch of tests changed to active tense	2016-08-09 15:11:39 +01:00
snippet_search_results_spec.rb
themes_spec.rb
upgrader_spec.rb	adds second batch of tests changed to active tense	2016-08-09 15:11:39 +01:00
uploads_transfer_spec.rb
url_builder_spec.rb	Add DiffNote model	2016-07-06 18:50:59 -04:00
url_sanitizer_spec.rb	spec and fix for sanitize method	2016-07-11 09:01:09 +02:00
user_access_spec.rb	changes default_branch_protection to allow devs_can_merge protection option aswell	2016-08-04 21:15:26 +01:00
version_info_spec.rb
workhorse_spec.rb