Use git follow flag for commits page when retrieve history for file or directory
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
7f5acdb20a
commit
03ea0c74af
|
@ -9,6 +9,7 @@ v 8.2.0 (unreleased)
|
||||||
- Allow users to select the Files view as default project view (Cristian Bica)
|
- Allow users to select the Files view as default project view (Cristian Bica)
|
||||||
- Show "Empty Repository Page" for repository without branches (Artem V. Navrotskiy)
|
- 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
|
- 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
|
v 8.1.0
|
||||||
- Ensure MySQL CI limits DB migrations occur after the fields have been created (Stan Hu)
|
- Ensure MySQL CI limits DB migrations occur after the fields have been created (Stan Hu)
|
||||||
|
|
|
@ -67,13 +67,16 @@ class Repository
|
||||||
end
|
end
|
||||||
|
|
||||||
def commits(ref, path = nil, limit = nil, offset = nil, skip_merges = false)
|
def commits(ref, path = nil, limit = nil, offset = nil, skip_merges = false)
|
||||||
commits = Gitlab::Git::Commit.where(
|
options = {
|
||||||
repo: raw_repository,
|
repo: raw_repository,
|
||||||
ref: ref,
|
ref: ref,
|
||||||
path: path,
|
path: path,
|
||||||
limit: limit,
|
limit: limit,
|
||||||
offset: offset,
|
offset: offset,
|
||||||
)
|
}
|
||||||
|
|
||||||
|
options[:follow] = true if path.present?
|
||||||
|
commits = Gitlab::Git::Commit.where(options)
|
||||||
commits = Commit.decorate(commits, @project) if commits.present?
|
commits = Commit.decorate(commits, @project) if commits.present?
|
||||||
commits
|
commits
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue