diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-03-01 23:30:51 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-03-01 23:30:51 +0300 |
commit | 7e2ad5d47a1d95281e2a217538dae67107a584c2 (patch) | |
tree | e86d3395d583d3bee5804aa09656a3e2db5e7d8b /app/serializers | |
parent | a87815fbc07359d83918e1ff61961af174f76fe0 (diff) | |
parent | a0101ebf84ed397899df8f3a017d2b25dc45db57 (diff) |
Merge branch 'fix/mwbs-to-mwps' into 'master'
Rename MWBS to MWPS
Closes #24707
See merge request !9335
Diffstat (limited to 'app/serializers')
-rw-r--r-- | app/serializers/merge_request_entity.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/merge_request_entity.rb b/app/serializers/merge_request_entity.rb index 7445298c714..5f80ab397a9 100644 --- a/app/serializers/merge_request_entity.rb +++ b/app/serializers/merge_request_entity.rb @@ -6,7 +6,7 @@ class MergeRequestEntity < IssuableEntity expose :merge_params expose :merge_status expose :merge_user_id - expose :merge_when_build_succeeds + expose :merge_when_pipeline_succeeds expose :source_branch expose :source_project_id expose :target_branch |