diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2017-10-18 21:52:53 +0300 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2017-10-18 21:52:53 +0300 |
| commit | 7e72a6751fc954756f514396453042927766a785 (patch) | |
| tree | b0bf571e885791fb3bbd85bca8f06593a2e56b2b /app/models/repository.rb | |
| parent | 03106288f92ac5ec9c4867cc1be9b070f157ccac (diff) | |
| parent | 83b59da6549d3137f1424ee9bf16b95e4f72173e (diff) | |
Merge branch '10-1-stable-prepare-rc3' into '10-1-stable'
Prepare 10.1 RC3 release
See merge request gitlab-org/gitlab-ce!14921
Diffstat (limited to 'app/models/repository.rb')
| -rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index bf526ca1762..43521a0ddd3 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -1127,7 +1127,7 @@ class Repository def last_commit_id_for_path_by_shelling_out(sha, path) args = %W(rev-list --max-count=1 #{sha} -- #{path}) - run_git(args).first.strip + raw_repository.run_git_with_timeout(args, Gitlab::Git::Popen::FAST_GIT_PROCESS_TIMEOUT).first.strip end def repository_storage_path |