diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-11-28 12:57:47 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-11-28 12:57:47 +0000 |
| commit | 04ceb69f3eea903d541614f42bbcdd008ad93839 (patch) | |
| tree | a6479e964f5c85200a6e73014b8ffafd297ae622 /lib/api/entities.rb | |
| parent | 9f287298270b3a833bc53b9280c6e3c6a2f055b8 (diff) | |
| download | gitlab-ce-04ceb69f3eea903d541614f42bbcdd008ad93839.tar.gz | |
Allow the status of a rebase to be determined
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index cff05643f3b..70a8d890e40 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -710,6 +710,10 @@ module API expose :diff_refs, using: Entities::DiffRefs + # Allow the status of a rebase to be determined + expose :merge_error + expose :rebase_in_progress?, as: :rebase_in_progress, if: -> (_, options) { options[:include_rebase_in_progress] } + expose :diverged_commits_count, as: :diverged_commits_count, if: -> (_, options) { options[:include_diverged_commits_count] } def build_available?(options) |