summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-12-04 15:01:32 +0000
committerRémy Coutable <remy@rymai.me>2017-12-04 15:01:32 +0000
commitf863808c536a6efaf00b09bf5d8841af5cd53020 (patch)
treeb2926f6af4a2955b0e0a18cd28d9d3537e6cf4c0
parent50b3a44750af35d25931351db8a443f0d96d9d22 (diff)
parent77c62927a567aa91421439697324587dfbb7007d (diff)
downloadgitlab-ce-f863808c536a6efaf00b09bf5d8841af5cd53020.tar.gz
Merge branch 'gollum-initializer-warning' into 'master'
Add notice to Gollum initializer See merge request gitlab-org/gitlab-ce!15713
-rw-r--r--config/initializers/gollum.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/initializers/gollum.rb b/config/initializers/gollum.rb
index 2fd47a3f4d3..f1066f83dd9 100644
--- a/config/initializers/gollum.rb
+++ b/config/initializers/gollum.rb
@@ -1,3 +1,7 @@
+# WARNING changes in this file must be manually propagated to gitaly-ruby.
+#
+# https://gitlab.com/gitlab-org/gitaly/blob/master/ruby/lib/gitlab/gollum.rb
+
module Gollum
GIT_ADAPTER = "rugged".freeze
end