diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-03-01 15:54:43 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-03-01 15:54:43 +0000 |
commit | de454de9b10f0dd534884c8ffeabe3e534993349 (patch) | |
tree | 40d8079befbc40943c17f781cb3856f011715d0a /app | |
parent | 461960262d51c719994f0f4236f79dfa1fc0f28f (diff) | |
parent | cd9daf644e2b3844b9382768a3add335f942b76c (diff) | |
download | gitlab-ce-de454de9b10f0dd534884c8ffeabe3e534993349.tar.gz |
Merge branch '42434-allow-commits-endpoint-to-work-over-all-commits' into 'master'
Resolve "Allow API method /projects/:id/repository/commits to work over all commits"
Closes #42434
See merge request gitlab-org/gitlab-ce!17182
Diffstat (limited to 'app')
-rw-r--r-- | app/models/repository.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 299a3f32a85..7888c1019e6 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -139,7 +139,7 @@ class Repository end end - def commits(ref, path: nil, limit: nil, offset: nil, skip_merges: false, after: nil, before: nil) + def commits(ref = nil, path: nil, limit: nil, offset: nil, skip_merges: false, after: nil, before: nil, all: nil) options = { repo: raw_repository, ref: ref, @@ -149,7 +149,8 @@ class Repository after: after, before: before, follow: Array(path).length == 1, - skip_merges: skip_merges + skip_merges: skip_merges, + all: all } commits = Gitlab::Git::Commit.where(options) |