Merge branch 'git-annex-disabled' into 'master'

Git annex disabled by default

cc @sytse

See merge request !57

4 files changed, 10 insertions, 4 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 1723ec2..304238e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,5 @@
 v2.5.0
-  - Support git-annex tool
+  - Support git-annex tool (disabled by default)
 
 v2.4.3
   - Print broadcast message if one is available
diff --git a/config.yml.example b/config.yml.example
index 66ab52d..4a8df5f 100644
--- a/config.yml.example
+++ b/config.yml.example
@@ -50,4 +50,4 @@ audit_usernames: false
 # Enable git-annex support
 # git-annex allows managing files with git, without checking the file contents into git
 # See https://git-annex.branchable.com/ for documentation
-git_annex_enabled: true
+git_annex_enabled: false
diff --git a/lib/gitlab_config.rb b/lib/gitlab_config.rb
index 422898d..300d6ba 100644
--- a/lib/gitlab_config.rb
+++ b/lib/gitlab_config.rb
@@ -48,7 +48,7 @@ class GitlabConfig
   end
 
   def git_annex_enabled?
-    @config['git_annex_enabled'] ||= true
+    @config['git_annex_enabled'] ||= false
   end
 
   # Build redis command to write update event in gitlab queue
diff --git a/spec/gitlab_shell_spec.rb b/spec/gitlab_shell_spec.rb
index af978b4..5abeeb9 100644
--- a/spec/gitlab_shell_spec.rb
+++ b/spec/gitlab_shell_spec.rb
@@ -75,6 +75,8 @@ describe GitlabShell do
       let(:repo_path) { File.join(tmp_repos_path, 'dzaporozhets/gitlab.git') }
 
       before do
+        GitlabConfig.any_instance.stub(git_annex_enabled?: true)
+
         # Create existing project
         FileUtils.mkdir_p(repo_path)
         cmd = %W(git --git-dir=#{repo_path} init --bare)
@@ -187,7 +189,11 @@ describe GitlabShell do
     end
 
     describe 'git-annex' do
-      before { ssh_cmd 'git-annex-shell commit /~/gitlab-ci.git SHA256' }
+      before do
+        GitlabConfig.any_instance.stub(git_annex_enabled?: true)
+        ssh_cmd 'git-annex-shell commit /~/gitlab-ci.git SHA256'
+      end
+
       after { subject.exec }
 
       it "should execute the command" do