Merge branch 'git-follow' into 'master'

Use git follow flag for commits page when retrieve history for file or directory

This can be really helpful when you want commit history for file that was moved recently

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1680
This commit is contained in:
Dmitriy Zaporozhets 2015-10-23 14:29:34 +00:00
commit 61fcb3c568
2 changed files with 6 additions and 2 deletions

View file

@ -10,6 +10,7 @@ v 8.2.0 (unreleased)
- Allow users to select the Files view as default project view (Cristian Bica)
- Show "Empty Repository Page" for repository without branches (Artem V. Navrotskiy)
- Fix: Inability to reply to code comments in the MR view, if the MR comes from a fork
- Use git follow flag for commits page when retrieve history for file or directory
v 8.1.0
- Ensure MySQL CI limits DB migrations occur after the fields have been created (Stan Hu)

View file

@ -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,
)
follow: path.present?
}
commits = Gitlab::Git::Commit.where(options)
commits = Commit.decorate(commits, @project) if commits.present?
commits
end