diff options
| author | Dennis Tang <dtang@gitlab.com> | 2018-06-21 11:48:25 +0300 |
|---|---|---|
| committer | Dennis Tang <dtang@gitlab.com> | 2018-06-21 11:48:25 +0300 |
| commit | 0e7f8fd5bd7ed184b8a12039739200065ffa2dbd (patch) | |
| tree | 07b3c3bbcc0d05848ab7034d2ed32a801f8786b9 /app/models/repository.rb | |
| parent | 203d1026008effeeba5c1f98dba768448473f9fe (diff) | |
| parent | 904cbe0132a1caf0dbb7efb8bdc70398d1d82289 (diff) | |
Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs
Diffstat (limited to 'app/models/repository.rb')
| -rw-r--r-- | app/models/repository.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index e4202505634..3089d0162ee 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -154,7 +154,10 @@ class Repository # Returns a list of commits that are not present in any reference def new_commits(newrev) - refs = ::Gitlab::Git::RevList.new(raw, newrev: newrev).new_refs + # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/1233 + refs = Gitlab::GitalyClient::StorageSettings.allow_disk_access do + ::Gitlab::Git::RevList.new(raw, newrev: newrev).new_refs + end refs.map { |sha| commit(sha.strip) } end @@ -847,7 +850,7 @@ class Repository @root_ref_sha ||= commit(root_ref).sha end - delegate :merged_branch_names, :can_be_merged?, to: :raw_repository + delegate :merged_branch_names, to: :raw_repository def merge_base(first_commit_id, second_commit_id) first_commit_id = commit(first_commit_id).try(:id) || first_commit_id |