diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2018-05-29 20:51:43 +1100 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2018-05-29 20:51:43 +1100 |
| commit | 4cff66a6c46361e8d775ea3f5a80bf147d4020b3 (patch) | |
| tree | f1f76411400f35f394fedd28ad03d42ccbaf990e /lib/api/entities.rb | |
| parent | 6e354cb642f911dc71be3d5368f066900fc25970 (diff) | |
| download | gitlab-ce-4cff66a6c46361e8d775ea3f5a80bf147d4020b3.tar.gz | |
Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ce
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 174c5af91d5..b630fd54354 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -568,6 +568,8 @@ module API expose :time_stats, using: 'API::Entities::IssuableTimeStats' do |merge_request| merge_request end + + expose :squash end class MergeRequest < MergeRequestBasic |