Merge branch '6-8-1-ee' into '6-8-stable-ee'

6 8 1 ee

Update version to 6.8.1-ee

CHANGELOG

+6.8.1-ee.omnibus
+- Update gitlab-rails to v6.8.1-ee
+
+6.8.0-ee.omnibus
 - MySQL client support (EE only)
 - Update to omnibus-ruby 3.0
 - Update omnibus-software (e.g. Postgres to 9.2.8)

config/software/gitlab-rails.rb

@@ -17,7 +17,7 @@
 #
 name "gitlab-rails"
-default_version "v6.8.0-ee"
+default_version "v6.8.1-ee"
 EE = system("#{Omnibus.project_root}/support/is_gitlab_ee.sh")

files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb

@@ -3,4 +3,4 @@
 cd <%= node['gitlab']['gitlab-rails']['dir'] %>/working
 exec 2>&1
-exec chpst -P -U <%= node['gitlab']['user']['username'] %> -u <%= node['gitlab']['user']['username'] %> /usr/bin/env BUNDLE_GEMFILE=/opt/gitlab/embedded/service/gitlab-rails/Gemfile HOME="<%= node['gitlab']['gitlab-rails']['dir'] %>" /opt/gitlab/embedded/bin/bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e <%= node['gitlab']['gitlab-rails']['environment'] %> -r /opt/gitlab/embedded/service/gitlab-rails
+exec chpst -P -U <%= node['gitlab']['user']['username'] %> -u <%= node['gitlab']['user']['username'] %> /usr/bin/env BUNDLE_GEMFILE=/opt/gitlab/embedded/service/gitlab-rails/Gemfile HOME="<%= node['gitlab']['user']['home'] %>" /opt/gitlab/embedded/bin/bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e <%= node['gitlab']['gitlab-rails']['environment'] %> -r /opt/gitlab/embedded/service/gitlab-rails

files/gitlab-cookbooks/gitlab/templates/default/sv-unicorn-run.erb

@@ -3,4 +3,4 @@
 cd /opt/gitlab/embedded/service/gitlab-rails
 exec 2>&1
-exec chpst -P -U <%= node['gitlab']['user']['username'] %> -u <%= node['gitlab']['user']['username'] %> /usr/bin/env HOME="<%= node['gitlab']['gitlab-rails']['dir'] %>" /opt/gitlab/embedded/bin/bundle exec unicorn -E <%= node['gitlab']['gitlab-rails']['environment'] %> -c <%= File.join(node['gitlab']['gitlab-rails']['dir'], "etc", "unicorn.rb") %> /opt/gitlab/embedded/service/gitlab-rails/config.ru
+exec chpst -P -U <%= node['gitlab']['user']['username'] %> -u <%= node['gitlab']['user']['username'] %> /usr/bin/env HOME="<%= node['gitlab']['user']['home'] %>" /opt/gitlab/embedded/bin/bundle exec unicorn -E <%= node['gitlab']['gitlab-rails']['environment'] %> -c <%= File.join(node['gitlab']['gitlab-rails']['dir'], "etc", "unicorn.rb") %> /opt/gitlab/embedded/service/gitlab-rails/config.ru