From f68256c48dafb65944de4fef30fe634fe76152ed Mon Sep 17 00:00:00 2001 From: Sami Hiltunen Date: Thu, 17 Dec 2020 17:37:46 +0100 Subject: [PATCH 1/2] Revert "Revert "Merge branch 'smh-revert-user-commit-files' into 'master'"" This reverts commit 9fdabd0652159aecb94404ed1a85fae5ca7737b6. --- changelogs/unreleased/smh-enable-user-commit-files.yml | 5 ----- internal/metadata/featureflag/feature_flags.go | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 changelogs/unreleased/smh-enable-user-commit-files.yml diff --git a/changelogs/unreleased/smh-enable-user-commit-files.yml b/changelogs/unreleased/smh-enable-user-commit-files.yml deleted file mode 100644 index 2334da4d3e4..00000000000 --- a/changelogs/unreleased/smh-enable-user-commit-files.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Enable Go port of UserCommitFiles by default -merge_request: 2922 -author: -type: performance diff --git a/internal/metadata/featureflag/feature_flags.go b/internal/metadata/featureflag/feature_flags.go index d9e2fb9f293..d4f33cc582b 100644 --- a/internal/metadata/featureflag/feature_flags.go +++ b/internal/metadata/featureflag/feature_flags.go @@ -28,7 +28,7 @@ var ( // GoUserSquash enables the Go implementation of UserSquash GoUserSquash = FeatureFlag{Name: "go_user_squash", OnByDefault: true} // GoUserCommitFiles enables the Go implementation of UserCommitFiles - GoUserCommitFiles = FeatureFlag{Name: "go_user_commit_files", OnByDefault: true} + GoUserCommitFiles = FeatureFlag{Name: "go_user_commit_files", OnByDefault: false} // GoResolveConflicts enables the Go implementation of ResolveConflicts GoResolveConflicts = FeatureFlag{Name: "go_resolve_conflicts", OnByDefault: false} // GoUserUpdateSubmodule enables the Go implementation of -- GitLab From 0b5a8ea8ebdf077642de1d09ffdbe98d4eed14d9 Mon Sep 17 00:00:00 2001 From: Sami Hiltunen Date: Thu, 17 Dec 2020 18:16:56 +0100 Subject: [PATCH 2/2] disable gochecknoglobals linter gochecknoglobals linter errors out on our feature flag definitions. This commit disables the linter until a solution is put to place or the feature flags are annotated as nolint. --- .golangci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.golangci.yml b/.golangci.yml index e7fcf402f64..df943324e32 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -12,7 +12,6 @@ linters: - errcheck - errorlint - gci - - gochecknoglobals - goimports - golint - gosimple -- GitLab