diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-09-15 15:50:49 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-09-15 19:16:57 +0800 |
| commit | 1f1d0d78a265884b18223e2e1fa6b9cd01ccb415 (patch) | |
| tree | 4b0175ad084577dfc8ff357063be05f6b13b9c3c | |
| parent | f3874d3168a29aaf16e2b69d7e723d932819e154 (diff) | |
| download | gitlab-ce-36292-check-if-we-need-to-fetch-ref.tar.gz | |
Just check ref existence directly36292-check-if-we-need-to-fetch-ref
| -rw-r--r-- | app/models/merge_request.rb | 4 | ||||
| -rw-r--r-- | app/models/repository.rb | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index fd722adb156..2a56bab48a3 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -810,13 +810,11 @@ class MergeRequest < ActiveRecord::Base def ref_fetched? super || - if project.repository.exists? + begin computed_value = project.repository.ref_exists?(ref_path) update_column(:ref_fetched, true) if computed_value computed_value - else - false end end diff --git a/app/models/repository.rb b/app/models/repository.rb index 035f85a0b46..6c612f8c5cd 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -214,8 +214,8 @@ class Repository end def ref_exists?(ref) - !!raw_repository&.ref_exists?(ref) - rescue ArgumentError + raw_repository.ref_exists?(ref) + rescue Gitlab::Git::Repository::NoRepository, ArgumentError false end |