Merge branch 'git_annex_config' into 'master'

Add git_annex_enabled config for gitlab.yml

Related gitlab-org/gitlab-ee#40

See merge request !612

files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb

@@ -219,7 +219,8 @@ template_symlink File.join(gitlab_rails_etc_dir, "gitlab.yml") do
     node['gitlab']['gitlab-rails'].to_hash.merge(
       gitlab_ci_all_broken_builds: node['gitlab']['gitlab-ci']['gitlab_ci_all_broken_builds'],
       gitlab_ci_add_pusher: node['gitlab']['gitlab-ci']['gitlab_ci_add_pusher'],
-      builds_directory: gitlab_ci_builds_dir
+      builds_directory: gitlab_ci_builds_dir,
+      git_annex_enabled: node['gitlab']['gitlab-shell']['git_annex_enabled']
     )
   )
   restarts dependent_services

files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb

@@ -323,6 +323,11 @@ production: &base
     # If you use non-standard ssh port you need to specify it
     ssh_port: <%= @gitlab_shell_ssh_port %>
 
+    # git-annex support (EE only)
+    # If this setting is set to true, the same setting in config.yml of
+    # gitlab-shell needs to be set to true
+    git_annex_enabled: <%= @git_annex_enabled %>
+
   ## Git settings
   # CAUTION!
   # Use the default values unless you really know what you are doing