diff options
| author | Ævar Arnfjörð Bjarmason <avar@gitlab.com> | 2020-12-15 13:16:30 +0300 |
|---|---|---|
| committer | Ævar Arnfjörð Bjarmason <avar@gitlab.com> | 2020-12-15 13:16:30 +0300 |
| commit | 14db2c1c88f0e90f34b95f1b6a48f3cb297cab35 (patch) | |
| tree | 23d16cdf63d0c68abb32d04477128e735a66fd6a | |
| parent | d52ea41f12a33a5213bf0067f0bc0beabb949556 (diff) | |
| parent | e2d397c3188df55b3e0074ab7173cbc53cec4b8a (diff) | |
Merge branch 'pks-revert-go-user-submodule-default' into 'master'
Revert "Merge branch 'po-user-update-submodule-ff-default' into 'master'"
See merge request gitlab-org/gitaly!2931
| -rw-r--r-- | changelogs/unreleased/po-user-update-submodule-ff-default.yml | 5 | ||||
| -rw-r--r-- | internal/metadata/featureflag/feature_flags.go | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/changelogs/unreleased/po-user-update-submodule-ff-default.yml b/changelogs/unreleased/po-user-update-submodule-ff-default.yml deleted file mode 100644 index be9c8c9a7..000000000 --- a/changelogs/unreleased/po-user-update-submodule-ff-default.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Enable feature flag gitaly_go_user_update_submodule by default -merge_request: 2917 -author: -type: added diff --git a/internal/metadata/featureflag/feature_flags.go b/internal/metadata/featureflag/feature_flags.go index d67c6d405..d9e2fb9f2 100644 --- a/internal/metadata/featureflag/feature_flags.go +++ b/internal/metadata/featureflag/feature_flags.go @@ -33,7 +33,7 @@ var ( GoResolveConflicts = FeatureFlag{Name: "go_resolve_conflicts", OnByDefault: false} // GoUserUpdateSubmodule enables the Go implementation of // UserUpdateSubmodules - GoUserUpdateSubmodule = FeatureFlag{Name: "go_user_update_submodule", OnByDefault: true} + GoUserUpdateSubmodule = FeatureFlag{Name: "go_user_update_submodule", OnByDefault: false} // GoFetchRemote enables the Go implementation of FetchRemote GoFetchRemote = FeatureFlag{Name: "go_fetch_remote", OnByDefault: true} // GoUserDeleteTag enables the Go implementation of UserDeleteTag |