kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

So that st_commits could never be nil

Browse source
This commit is contained in:
Lin Jen-Shin 2016-09-22 17:28:36 +08:00
parent 6987ec29b0
commit 4ed23a3a57
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/models/merge_request_diff.rb
View file

@ -30,6 +30,10 @@ class MergeRequestDiff < ActiveRecord::Base
select(column_names - ['st_diffs'])
end
def st_commits
super || []
end
# Collect information about commits and diff from repository
# and save it to the database as serialized data
def save_git_content
@ -83,7 +87,7 @@ class MergeRequestDiff < ActiveRecord::Base
end
def commits
@commits ||= load_commits(st_commits || [])
@commits ||= load_commits(st_commits)
end
def reload_commits
@ -120,10 +124,8 @@ class MergeRequestDiff < ActiveRecord::Base
def commits_sha
if @commits
commits.map(&:sha)
elsif st_commits
st_commits.map { |commit| commit[:id] }
else
[]
st_commits.map { |commit| commit[:id] }
end
end