gitlab: 12.3.5 -> 12.4.0

- gitlab-shell no longer requires ruby for anything else than the
  install script, so the bundlerEnv stuff could be dropped

- gitlab-shell and gitlab-workhorse now report their versions
  correctly
This commit is contained in:
talyz
2019-10-28 14:56:37 +01:00
committed by Emery Hemingway
parent e79bc59532
commit 5081a6cd56
18 changed files with 1217 additions and 1729 deletions
@@ -150,3 +150,14 @@ index b276a81eac..070e3ebd81 100644
end
end
end
--- a/lib/gitlab/authorized_keys.rb
+++ b/lib/gitlab/authorized_keys.rb
@@ -157,7 +157,7 @@
raise KeyError, "Invalid ID: #{id.inspect}"
end
- "#{File.join(Gitlab.config.gitlab_shell.path, 'bin', 'gitlab-shell')} #{id}"
+ "#{File.join('/run/current-system/sw/bin', 'gitlab-shell')} #{id}"
end
def strip(key)