summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@gitlab.com>2019-06-03 08:12:14 +0000
committerBob Van Landuyt <bob@gitlab.com>2019-06-03 08:12:14 +0000
commitaf5bd974a49280e35b0dd6ea5859eaf1aa5588df (patch)
tree58229259b6d674385e014f23288835f95e9af5f3
parent33265ea368d2af255d6289eaf764c9724269397e (diff)
parentb8372598e910cfd5b0b70cb62f465a915780fc55 (diff)
downloadgitlab-ce-af5bd974a49280e35b0dd6ea5859eaf1aa5588df.tar.gz
Merge branch 'zj-remove-delta-island-feature-flag' into 'master'
Remove delta island feature flag Closes gitaly#1575 See merge request gitlab-org/gitlab-ce!28871
-rw-r--r--changelogs/unreleased/zj-remove-delta-island-feature-flag.yml3
-rw-r--r--lib/gitlab/gitaly_client.rb2
2 files changed, 4 insertions, 1 deletions
diff --git a/changelogs/unreleased/zj-remove-delta-island-feature-flag.yml b/changelogs/unreleased/zj-remove-delta-island-feature-flag.yml
new file mode 100644
index 00000000000..e752e01b701
--- /dev/null
+++ b/changelogs/unreleased/zj-remove-delta-island-feature-flag.yml
@@ -0,0 +1,3 @@
+merge_request: 28871
+title: Improve clone performance by using delta islands
+type: performance
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index 05e06eec012..e683d4e5bbe 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -33,7 +33,7 @@ module Gitlab
SERVER_FEATURE_CATFILE_CACHE = 'catfile-cache'.freeze
# Server feature flags should use '_' to separate words.
- SERVER_FEATURE_FLAGS = [SERVER_FEATURE_CATFILE_CACHE, 'delta_islands'].freeze
+ SERVER_FEATURE_FLAGS = [SERVER_FEATURE_CATFILE_CACHE].freeze
MUTEX = Mutex.new