diff options
| author | James Fargher <proglottis@gmail.com> | 2020-10-21 05:38:55 +0300 |
|---|---|---|
| committer | James Fargher <proglottis@gmail.com> | 2020-10-21 05:38:55 +0300 |
| commit | f24708577af7bc9dbde7310d299346b024ef1bab (patch) | |
| tree | bc4f8bfb51d1157df02ed6afb681a9e3b474f36a | |
| parent | dac25a9c19af0a168a7927784295dd12fb5c8075 (diff) | |
Use the actual feature flag when using testWithFeature helper
| -rw-r--r-- | internal/gitaly/service/operations/merge_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/gitaly/service/operations/merge_test.go b/internal/gitaly/service/operations/merge_test.go index eb9e01d32..d165c6f27 100644 --- a/internal/gitaly/service/operations/merge_test.go +++ b/internal/gitaly/service/operations/merge_test.go @@ -29,7 +29,7 @@ var ( func testWithFeature(t *testing.T, feature featureflag.FeatureFlag, testcase func(*testing.T, context.Context)) { featureSets, err := testhelper.NewFeatureSets([]featureflag.FeatureFlag{ - featureflag.GoUserMergeBranch, + feature, }) require.NoError(t, err) |