diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2017-08-03 15:47:43 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2017-08-03 15:48:10 +0200 |
| commit | 29a07fd3a12115377f726248a342052a5ae07ed2 (patch) | |
| tree | 23f06e321ee5a0560a74a8e3e29222928267fc7e /lib/gitlab | |
| parent | 23c502b43404aa70741462da5d57c23196f6088a (diff) | |
| download | gitlab-ce-29a07fd3a12115377f726248a342052a5ae07ed2.tar.gz | |
Rename 'commits_between' to 'rugged_commits_between'
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/git/commit.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/git/repository.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/gitlab/git/commit.rb b/lib/gitlab/git/commit.rb index ca7e3a7c4be..600d886e818 100644 --- a/lib/gitlab/git/commit.rb +++ b/lib/gitlab/git/commit.rb @@ -102,7 +102,7 @@ module Gitlab if is_enabled repo.gitaly_commit_client.between(base, head) else - repo.commits_between(base, head).map { |c| decorate(c) } + repo.rugged_commits_between(base, head).map { |c| decorate(c) } end end rescue Rugged::ReferenceError diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 70d793f8e4a..26ad40c3eed 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -327,7 +327,9 @@ module Gitlab # Return a collection of Rugged::Commits between the two revspec arguments. # See http://git-scm.com/docs/git-rev-parse.html#_specifying_revisions for # a detailed list of valid arguments. - def commits_between(from, to) + # + # Gitaly note: JV: to be deprecated in favor of Commit.between + def rugged_commits_between(from, to) walker = Rugged::Walker.new(rugged) walker.sorting(Rugged::SORT_NONE | Rugged::SORT_REVERSE) |