diff options
| author | Valery Sizov <valery@gitlab.com> | 2017-09-14 18:30:30 +0300 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-09-19 23:48:40 -0500 |
| commit | ffa2c5d41e5247bee0d94bee4ec33ac1566e829c (patch) | |
| tree | f8af89bbadaac3305013f9dd6b61e8fb88d399ae /spec/serializers | |
| parent | dd35c1d556ea5809ef2aefd8ec5741d7b4d83372 (diff) | |
| download | gitlab-ce-ffa2c5d41e5247bee0d94bee4ec33ac1566e829c.tar.gz | |
Add spec for Repository#ff_merge (ported from EE)
Diffstat (limited to 'spec/serializers')
| -rw-r--r-- | spec/serializers/merge_request_entity_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/serializers/merge_request_entity_spec.rb b/spec/serializers/merge_request_entity_spec.rb index a2fd5b7daae..4288955ddbc 100644 --- a/spec/serializers/merge_request_entity_spec.rb +++ b/spec/serializers/merge_request_entity_spec.rb @@ -47,7 +47,8 @@ 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, :merge_ongoing) + :target_branch_tree_path, :commits_count, :merge_ongoing, + :ff_only_enabled) end it 'has email_patches_path' do |