diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-07-31 19:01:36 -0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-08-07 15:23:37 -0300 |
| commit | 0640b3d1d89b7a4eda343eb23b0518a835ac9106 (patch) | |
| tree | 13970b43017ada593f08b70ca713dc19a1f064cf /spec/serializers | |
| parent | b12107a0b953b566cd58db30ae880800a4a695a6 (diff) | |
| download | gitlab-ce-0640b3d1d89b7a4eda343eb23b0518a835ac9106.tar.gz | |
Store MergeWorker JID on merge request, and clean up stuck merges
Diffstat (limited to 'spec/serializers')
| -rw-r--r-- | spec/serializers/merge_request_entity_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/serializers/merge_request_entity_spec.rb b/spec/serializers/merge_request_entity_spec.rb index 18cd9e9c006..a2fd5b7daae 100644 --- a/spec/serializers/merge_request_entity_spec.rb +++ b/spec/serializers/merge_request_entity_spec.rb @@ -47,7 +47,7 @@ describe MergeRequestEntity do :cancel_merge_when_pipeline_succeeds_path, :create_issue_to_resolve_discussions_path, :source_branch_path, :target_branch_commits_path, - :target_branch_tree_path, :commits_count) + :target_branch_tree_path, :commits_count, :merge_ongoing) end it 'has email_patches_path' do |