diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-09-29 22:13:35 +0300 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-09-29 22:13:35 +0300 |
| commit | 439e3f073591b41ef9926a4b8c33000ae1b068f7 (patch) | |
| tree | 9ae497ed8747b398de6232dec8c6626726f6a5eb /spec/javascripts | |
| parent | dbfe8597419d409b10ce79daec7f5b39cfad492d (diff) | |
Port semi-linear merge strategy to CE (mostly FE)
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/vue_mr_widget/components/states/mr_widget_conflicts_spec.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_conflicts_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_conflicts_spec.js index cc3d638dd06..5d4c7ec09dc 100644 --- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_conflicts_spec.js +++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_conflicts_spec.js @@ -81,13 +81,13 @@ describe('MRWidgetConflicts', () => { }); }); - describe('when fast-forward merge enabled', () => { + describe('when fast-forward or semi-linear merge enabled', () => { let vm; beforeEach(() => { vm = mountComponent(ConflictsComponent, { mr: { - ffOnlyEnabled: true, + shouldBeRebased: true, }, }); }); |