Merge branch 'master' of gitlab.com:gitlab-org/omnibus-gitlab

CHANGELOG.md

@@ -5,6 +5,7 @@ omnibus-gitlab repository.
 9.2.0
+- Add a missing symlink for /opt/gitlab/init/sshd to make `gitlab-ctl stop` work in Docker 4a098168
 - Allow setting `usage_ping_enabled` in `gitlab.rb`
 - Update mysql client to 5.5.55
 - Add a build env variable ALTERNATIVE_SOURCES f0cab0c6

CONTRIBUTING.md

@@ -17,6 +17,15 @@ This can be the case when installation and `gitlab-ctl reconfigure` run went wit
 ## Maintainer documentation
+Maintainers of this project will try to address issues in a timely manner.
+Maintainers, however, cannot guarantee that they would be able to address
+all incoming issues as soon as they are raised nor can guarantee to provide an
+answer to all raised issues.
+
+If your issue is closed due to inactivity (from either side), please check
+whether the issue persists in the latest version. If that is the case, feel free
+to reopen the issue or create a new one with a link to the old issue.
+
 ### Issue description templates
 Issue description template will show this message to
@@ -72,7 +81,7 @@ Request includes more tests. This is to ensure that the test coverage grows with
 development.
 When in rush to fix something (eg. security issue, bug blocking the release),
-writing specs can be skipped. However, an issue to implement the tests 
+writing specs can be skipped. However, an issue to implement the tests
 **must be** created and assigned to the person who originally wrote the code.
 To run tests, execute the following command (you may have to run `bundle install` before running it)

config/software/registry.rb

@@ -19,12 +19,12 @@
 require "#{Omnibus::Config.project_root}/lib/gitlab/version"
 name 'registry'
-version = Gitlab::Version.new('registry', '2.6.1')
-default_version version.print
+version = Gitlab::Version.new('registry', 'dd544a82d93e8d39cec3d3d45117c3f486365589')
+default_version version.print(false)
 license 'Apache-2.0'
-license_file "https://raw.githubusercontent.com/docker/distribution/#{version.print}/LICENSE"
+license_file "https://gitlab.com/omnibus-mirror/distribution/raw/#{version.print(false)}/LICENSE"
 source git: version.remote

docker/assets/wrapper

@@ -72,6 +72,7 @@ fi
 echo "Preparing services..."
 rm -f /opt/gitlab/service/*
 ln -s /opt/gitlab/sv/sshd /opt/gitlab/service
+ln -s /opt/gitlab/embedded/bin/sv /opt/gitlab/init/sshd
 mkdir -p /var/log/gitlab/sshd
 # Start service manager