summaryrefslogtreecommitdiff
path: root/lib/gitlab/upgrader.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-11-03 17:10:38 -0500
committerRobert Speicher <rspeicher@gmail.com>2015-11-03 17:11:09 -0500
commitd09d62b6b875102b7a334fcf9e689537e1f25013 (patch)
tree4b6714fa07b8d4975131e68a9a293425ed85f665 /lib/gitlab/upgrader.rb
parent312375ac7c7d6619740899cd185a8dde1d653955 (diff)
downloadgitlab-ce-d09d62b6b875102b7a334fcf9e689537e1f25013.tar.gz
Replace all usages of `git` command with configurable binary pathrs-git-bin-path
Closes #3311
Diffstat (limited to 'lib/gitlab/upgrader.rb')
-rw-r--r--lib/gitlab/upgrader.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/upgrader.rb b/lib/gitlab/upgrader.rb
index cf040971c6e..f3567f3ef85 100644
--- a/lib/gitlab/upgrader.rb
+++ b/lib/gitlab/upgrader.rb
@@ -50,15 +50,15 @@ module Gitlab
end
def fetch_git_tags
- remote_tags, _ = Gitlab::Popen.popen(%W(git ls-remote --tags https://gitlab.com/gitlab-org/gitlab-ce.git))
+ remote_tags, _ = Gitlab::Popen.popen(%W(#{Gitlab.config.git.bin_path} ls-remote --tags https://gitlab.com/gitlab-org/gitlab-ce.git))
remote_tags.split("\n").grep(/tags\/v#{current_version.major}/)
end
def update_commands
{
- "Stash changed files" => %W(git stash),
- "Get latest code" => %W(git fetch),
- "Switch to new version" => %W(git checkout v#{latest_version}),
+ "Stash changed files" => %W(#{Gitlab.config.git.bin_path} stash),
+ "Get latest code" => %W(#{Gitlab.config.git.bin_path} fetch),
+ "Switch to new version" => %W(#{Gitlab.config.git.bin_path} checkout v#{latest_version}),
"Install gems" => %W(bundle),
"Migrate DB" => %W(bundle exec rake db:migrate),
"Recompile assets" => %W(bundle exec rake assets:clean assets:precompile),