diff options
| author | Phil Hughes <me@iamphill.com> | 2018-05-30 07:38:31 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-05-30 07:38:31 +0000 |
| commit | fd79df64c5411308e67a62b4c02a07f5317ddec1 (patch) | |
| tree | 8f923668b4abebc14cba1923acdd7700a8f3ba96 /lib/api/entities.rb | |
| parent | e869387ca27f9a9ac34f6398876714199fc3100e (diff) | |
| parent | 4cff66a6c46361e8d775ea3f5a80bf147d4020b3 (diff) | |
| download | gitlab-ce-fd79df64c5411308e67a62b4c02a07f5317ddec1.tar.gz | |
Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master'
Resolve "Squash and merge in GitLab Core (CE)"
Closes #34591
See merge request gitlab-org/gitlab-ce!18956
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 3688b44b8df..49cd4fccc63 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 |