diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-10-17 12:15:40 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-10-17 12:15:40 +0100 |
| commit | 9245bfc2936209eb52c1f34451b2ecd401626c60 (patch) | |
| tree | fa0b996bcc5d90135a6e915f452f7856ff9540ac /lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits.rb | |
| parent | 4bbdab764d808a86e2e726b4a717a64da8655a10 (diff) | |
| download | gitlab-ce-9245bfc2936209eb52c1f34451b2ecd401626c60.tar.gz | |
Handle null serialised commits in background migration39181-gitlab-backgroundmigration-deserializemergerequestdiffsandcommits-error-nomethoderror-undefined-method-map-for-nil-nilclass
This is already handled for diffs, but not commits.
Diffstat (limited to 'lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits.rb')
| -rw-r--r-- | lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits.rb b/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits.rb index 8e5c95f2287..380802258f5 100644 --- a/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits.rb +++ b/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits.rb @@ -81,6 +81,7 @@ module Gitlab def single_diff_rows(merge_request_diff) sha_attribute = Gitlab::Database::ShaAttribute.new commits = YAML.load(merge_request_diff.st_commits) rescue [] + commits ||= [] commit_rows = commits.map.with_index do |commit, index| commit_hash = commit.to_hash.with_indifferent_access.except(:parent_ids) |