Commit e7dd51ae authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

Git annex disabled by default

cc @sytse

See merge request !57
parents bb884125 5dae7411
v2.5.0
- Support git-annex tool
- Support git-annex tool (disabled by default)
v2.4.3
- Print broadcast message if one is available
......
......@@ -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
......@@ -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
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment