kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/spec
History
Robert Speicher 79eb7e4e92 Merge branch 'sh-fix-issue-20776' into 'master' 
Fix Error 500 when viewing old merge requests with bad diff data

Customers running old versions of GitLab may have MergeRequestDiffs with the text ["--broken diff"] due to text generated by gitlab_git 1.0.3.
To avoid the Error 500, verify that each element is a type that gitlab_git will accept before attempting to create a DiffCollection.
    
Closes #20776

See merge request !6754
 		2016-10-11 11:41:02 +00:00
..
config
…
controllers Merge branch 'dz-cleanup-routing' into 'master' 2016-10-11 06:58:05 +00:00
factories Add markdown cache columns to the database, but don't use them yet 2016-10-07 02:54:25 +01:00
features Correct namespace validation to forbid bad names #21077 2016-10-07 13:46:59 -05:00
finders Precalculate trending projects 2016-10-10 12:27:08 +02:00
fixtures Returns the total number of issues in the JSON response 2016-08-31 09:30:37 +01:00
helpers Merge branch 'rs-optimize-award_user_list-spec' into 'master' 2016-10-07 15:18:22 +00:00
initializers
…
javascripts Prevent conflict b/w search field and its dropdown 2016-10-10 10:16:09 +02:00
lib HTMLEntityFilter -> HtmlEntityFilter 2016-10-10 15:46:26 +01:00
mailers override subject method in devise mailer 2016-10-03 18:07:28 +08:00
models Merge branch 'sh-fix-issue-20776' into 'master' 2016-10-11 11:41:02 +00:00
policies Improve project policy spec 2016-10-06 18:54:28 -03:00
requests Fix api users spec for post request with invalid id 2016-10-10 16:32:32 +03:00
routing Catch any undefined API routing and return 400 Bad Request 2016-10-10 16:32:32 +03:00
services Merge branch 'empty-mrs' into 'master' 2016-10-11 09:58:00 +00:00
support Merge commit 'dev/security' into 'master' 2016-10-06 08:33:11 +02:00
tasks/gitlab Add a new gitlab:users:clear_all_authentication_tokens task 2016-10-11 10:21:18 +02:00
uploaders
…
views Merge commit 'dev/security' into 'master' 2016-10-06 08:33:11 +02:00
workers Precalculate trending projects 2016-10-10 12:27:08 +02:00
factories_spec.rb
…
rails_helper.rb
…
simplecov_env.rb Bump SimpleCov merge timeout to 365 days 2016-08-22 13:44:14 +02:00
spec_helper.rb Try tmpfs for repository storage, etc 2016-10-06 17:42:56 +01:00
teaspoon_env.rb
…