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 /app/serializers | |
| 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 'app/serializers')
| -rw-r--r-- | app/serializers/merge_request_widget_entity.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/serializers/merge_request_widget_entity.rb b/app/serializers/merge_request_widget_entity.rb index d0165c148eb..141070aef45 100644 --- a/app/serializers/merge_request_widget_entity.rb +++ b/app/serializers/merge_request_widget_entity.rb @@ -10,6 +10,7 @@ class MergeRequestWidgetEntity < IssuableEntity expose :merge_when_pipeline_succeeds expose :source_branch expose :source_project_id + expose :squash expose :target_branch expose :target_project_id expose :allow_maintainer_to_push |