summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-23 13:13:22 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-23 13:13:22 +0200
commit03ea0c74af8bfe6600eb4a7cc04a5d6cfc677f59 (patch)
tree911433888b2953cb5d3e1c48803eee25425bc30e /app
parent7f5acdb20ac9b5908e6cf15c8fb5f7952a745f1c (diff)
downloadgitlab-ce-03ea0c74af8bfe6600eb4a7cc04a5d6cfc677f59.tar.gz
Use git follow flag for commits page when retrieve history for file or directory
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
-rw-r--r--app/models/repository.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 88d3d73a40e..a517c7d6982 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -67,13 +67,16 @@ class Repository
end
def commits(ref, path = nil, limit = nil, offset = nil, skip_merges = false)
- commits = Gitlab::Git::Commit.where(
+ options = {
repo: raw_repository,
ref: ref,
path: path,
limit: limit,
offset: offset,
- )
+ }
+
+ options[:follow] = true if path.present?
+ commits = Gitlab::Git::Commit.where(options)
commits = Commit.decorate(commits, @project) if commits.present?
commits
end