diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-27 00:08:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-27 00:08:51 +0300 |
| commit | 757d2fda7e2936b071a4cb600046ca375051d7c5 (patch) | |
| tree | 76673008cb2e31c1df8705d0388fd3cabdd79d2d /app/models | |
| parent | ebe92e84a92d7d00710a6c5017ef2bb160268471 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/repository.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index aef11936ca0..6d167700ff4 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -149,7 +149,8 @@ class Repository before: opts[:before], all: !!opts[:all], first_parent: !!opts[:first_parent], - order: opts[:order] + order: opts[:order], + literal_pathspec: opts.fetch(:literal_pathspec, true) } commits = Gitlab::Git::Commit.where(options) @@ -676,8 +677,8 @@ class Repository end end - def list_last_commits_for_tree(sha, path, offset: 0, limit: 25) - commits = raw_repository.list_last_commits_for_tree(sha, path, offset: offset, limit: limit) + def list_last_commits_for_tree(sha, path, offset: 0, limit: 25, literal_pathspec: false) + commits = raw_repository.list_last_commits_for_tree(sha, path, offset: offset, limit: limit, literal_pathspec: literal_pathspec) commits.each do |path, commit| commits[path] = ::Commit.new(commit, container) |