gitlab-org--gitlab-foss/spec
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
..
config Small refactor and a few documentation fixes 2016-08-04 19:02:39 +02:00
controllers Remove gitorious 2016-08-25 10:10:10 +01:00
factories api: expose wiki_page_events project hook field in the API 2016-08-24 10:33:51 -04:00
features Merge branch '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data' into 'master' 2016-08-25 19:08:38 +00:00
finders Merge branch 'issue_18135' into 'master' 2016-08-19 23:06:30 +00:00
fixtures Fix JSON schema to issues in issue board lists 2016-08-19 11:47:33 -03:00
helpers Show "Create Merge Request" widget for push events to fork projects on the source project 2016-08-24 18:54:26 +02:00
initializers Give priority to environment variables 2016-08-03 15:48:48 +01:00
javascripts use gitlab global root url as canonical base url for all javascript set cookies (closes #20435) 2016-08-24 22:11:28 -05:00
lib Merge branch '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data' into 'master' 2016-08-25 19:08:38 +00:00
mailers Merge branch 'master' into 'expiration-date-on-memberships' 2016-08-19 10:58:01 +00:00
models Merge branch '21275-getting-500-error-when-viewing-a-merge-request' 2016-08-25 14:05:05 -05:00
requests Merge branch 'dz-merge-request-version' 2016-08-25 12:59:21 -05:00
routing Support integration with Koding (online IDE) 2016-08-19 12:10:58 -07:00
services Merge branch '19730-mark-as-done' into 'master' 2016-08-25 19:04:16 +00:00
support Handle non-UTF-8 conflicts gracefully 2016-08-25 08:27:08 +01:00
tasks/gitlab Use `File::exist?` instead of `File::exists?` 2016-08-11 13:54:45 +03:00
uploaders
views Update Hamlit to 2.6.1 2016-08-18 13:26:32 -05:00
workers Merge branch '21010-emailsonpushworker-incorrectly-claims-deleted-a-commit-after-a-push' into 'master' 2016-08-19 18:16:55 +00:00
factories_spec.rb adds second batch of tests changed to active tense 2016-08-09 15:11:39 +01:00
rails_helper.rb
simplecov_env.rb Bump SimpleCov merge timeout to 365 days 2016-08-22 13:44:14 +02:00
spec_helper.rb Use travel_to instead of dependency injection, feedback: 2016-08-19 16:57:25 +08:00
teaspoon_env.rb Add test coverage analysis for CoffeeScript (!5052) 2016-08-07 21:52:37 +02:00