summaryrefslogtreecommitdiff
path: root/lib/gitlab_config.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-02-16 17:53:41 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-02-16 17:53:41 +0000
commitbb88412570e604c1960ea3dd3bfc686f539576dc (patch)
tree74c195e9eba8af74d2fb4ecd41ae95824c408320 /lib/gitlab_config.rb
parentf61186ba00ac1c6e96e4e16d7fe118debcdda1ea (diff)
parent6c12bf39b302cc8913f462ca0c3fd9579b354f26 (diff)
downloadgitlab-shell-bb88412570e604c1960ea3dd3bfc686f539576dc.tar.gz
Merge branch 'git-annex' into 'master'
Git annex support - [x] fix auth for git-annex - [x] enable git-annex for repository on first annex call - [x] config option to disable it - [x] write tests See merge request !55
Diffstat (limited to 'lib/gitlab_config.rb')
-rw-r--r--lib/gitlab_config.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab_config.rb b/lib/gitlab_config.rb
index c97743b..422898d 100644
--- a/lib/gitlab_config.rb
+++ b/lib/gitlab_config.rb
@@ -47,6 +47,10 @@ class GitlabConfig
@config['audit_usernames'] ||= false
end
+ def git_annex_enabled?
+ @config['git_annex_enabled'] ||= true
+ end
+
# Build redis command to write update event in gitlab queue
def redis_command
if redis.empty?