diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-05-30 14:26:54 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-05-30 14:26:54 +0300 |
| commit | ef5282ee368ba15207c86b67bf224b3b54efcce1 (patch) | |
| tree | 87219d9c86899effb6c4cebc19ef7ce642df2869 /app/serializers | |
| parent | 6f5206178d3105ba78ec609450104ede50470e7d (diff) | |
| parent | 8df2e8cfb8973fafb11041bde04600a2823baf85 (diff) | |
| download | gitlab-ce-ef5282ee368ba15207c86b67bf224b3b54efcce1.tar.gz | |
Merge remote-tracking branch 'origin/master' into 46487-add-support-for-jupyter-in-gitlab-via-kubernetes
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 |