diff options
| author | Maciej Nowak <maciejt.nowak@gmail.com> | 2018-06-23 22:39:11 +0300 |
|---|---|---|
| committer | Maciej Nowak <maciejt.nowak@gmail.com> | 2018-06-28 10:19:50 +0300 |
| commit | 591edb439c2608f7448d7c3d5d2fc35e0ad5e8c1 (patch) | |
| tree | 9219fc5db67b8d8aa8a40de5f01e27318728dc2a /lib/api/repositories.rb | |
| parent | 2bac2918b2d6f12d94f739f4b6865b9e9221c642 (diff) | |
Allow straight diff in Compare API
Repository compare API now allows choosing straight (from..to) or merge-base diff (from...to)
Diffstat (limited to 'lib/api/repositories.rb')
| -rw-r--r-- | lib/api/repositories.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/repositories.rb b/lib/api/repositories.rb index bb3fa99af38..33a9646ac3b 100644 --- a/lib/api/repositories.rb +++ b/lib/api/repositories.rb @@ -100,9 +100,10 @@ module API params do requires :from, type: String, desc: 'The commit, branch name, or tag name to start comparison' requires :to, type: String, desc: 'The commit, branch name, or tag name to stop comparison' + optional :straight, type: Boolean, desc: 'Comparison method, `true` for direct comparison between `from` and `to` (`from`..`to`), `false` to compare using merge base (`from`...`to`)', default: false end get ':id/repository/compare' do - compare = Gitlab::Git::Compare.new(user_project.repository.raw_repository, params[:from], params[:to]) + compare = Gitlab::Git::Compare.new(user_project.repository.raw_repository, params[:from], params[:to], straight: params[:straight]) present compare, with: Entities::Compare end |