Merge branch '1648-remove-git-annex-support' into 'master'

Remove git annex configurations

Closes gitlab-ee#1648

See merge request !1353

docker/Dockerfile

@@ -12,7 +12,6 @@ RUN apt-get update -q \
       apt-transport-https \
       vim \
       nano \
-      git-annex \
     && rm -rf /var/lib/apt/lists/* \
     && sed 's/session\s*required\s*pam_loginuid.so/session optional pam_loginuid.so/g' -i /etc/pam.d/sshd
 

files/gitlab-config-template/gitlab.rb.template

@@ -536,14 +536,6 @@ external_url 'GENERATED_EXTERNAL_URL'
 # gitlab_shell['log_directory'] = "/var/log/gitlab/gitlab-shell/"
 # gitlab_shell['custom_hooks_dir'] = "/opt/gitlab/embedded/service/gitlab-shell/hooks"
 
-##! **If enabled, git-annex needs to be installed on the server where GitLab is
-##!   setup.
-##!   For Debian and Ubuntu systems this can be done with:
-##!   `sudo apt-get install git-annex`.
-##!   For CentOS:
-##!   `sudo yum install epel-release && sudo yum install git-annex`**
-# gitlab_shell['git_annex_enabled'] = false
-
 # gitlab_shell['auth_file'] = "/var/opt/gitlab/.ssh/authorized_keys"
 
 ### Git trace log file.

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -328,7 +328,6 @@ default['gitlab']['gitlab-rails']['repositories_storages'] = {
   "default" => { "path" => "/var/opt/gitlab/git-data/repositories" }
 }
 default['gitlab']['gitlab-shell']['http_settings'] = nil
-default['gitlab']['gitlab-shell']['git_annex_enabled'] = nil
 default['gitlab']['gitlab-shell']['auth_file'] = nil
 default['gitlab']['gitlab-shell']['git_trace_log_file'] = nil
 default['gitlab']['gitlab-shell']['custom_hooks_dir'] = nil

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

@@ -241,7 +241,6 @@ templatesymlink "Create a gitlab.yml and create a symlink to Rails root" do
       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,
-      git_annex_enabled: node['gitlab']['gitlab-shell']['git_annex_enabled'],
       pages_external_http: node['gitlab']['gitlab-pages']['external_http'],
       pages_external_https: node['gitlab']['gitlab-pages']['external_https'],
       mattermost_host: mattermost_host,

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

@@ -57,15 +57,6 @@ end
   end
 end
 
-# All repositories under GitLab share one hooks directory under
-# /opt/gitlab. Git-Annex wants write access to this hook directory, but
-# this directory is owned by root in the package.
-directory hooks_directory do
-  owner git_user
-  group git_group
-  mode "0755"
-end
-
 [
   log_directory,
   gitlab_shell_var_dir
@@ -108,7 +99,6 @@ templatesymlink "Create a config.yml and create a symlink to Rails root" do
     :log_level => node['gitlab']['gitlab-shell']['log_level'],
     :audit_usernames => node['gitlab']['gitlab-shell']['audit_usernames'],
     :http_settings => node['gitlab']['gitlab-shell']['http_settings'],
-    :git_annex_enabled => node['gitlab']['gitlab-shell']['git_annex_enabled'],
     :git_trace_log_file => node['gitlab']['gitlab-shell']['git_trace_log_file'],
     :custom_hooks_dir => node['gitlab']['gitlab-shell']['custom_hooks_dir']
   })

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

@@ -51,14 +51,6 @@ log_level: <%= @log_level %>
 # incurs an extra API call on every gitlab-shell command.
 audit_usernames: <%= @audit_usernames %>
 
-# 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
-# If enabled, git-annex needs to be installed on the server where gitlab-shell is setup
-# For Debian and Ubuntu systems this can be done with: sudo apt-get install git-annex
-# For CentOS: sudo yum install epel-release && sudo yum install git-annex
-git_annex_enabled: <%= @git_annex_enabled %>
-
 <% if @git_trace_log_file %>
 # Git trace log file.
 # If set, git commands receive GIT_TRACE* environment variables

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

@@ -382,11 +382,6 @@ 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