Merge pull request #2033 from mizzy/fix-hash-key-in-backup.rake
Fix hash key settings["gitlab_version"] to settings[:gitlab_version]
This commit is contained in:
commit
6e3e3e7fd2
|
@ -85,11 +85,11 @@ namespace :gitlab do
|
||||||
ENV["VERSION"] = "#{settings["db_version"]}" if settings["db_version"].to_i > 0
|
ENV["VERSION"] = "#{settings["db_version"]}" if settings["db_version"].to_i > 0
|
||||||
|
|
||||||
# restoring mismatching backups can lead to unexpected problems
|
# restoring mismatching backups can lead to unexpected problems
|
||||||
if settings["gitlab_version"] != %x{git rev-parse HEAD}.gsub(/\n/,"")
|
if settings[:gitlab_version] != %x{git rev-parse HEAD}.gsub(/\n/,"")
|
||||||
puts "gitlab_version mismatch:".red
|
puts "gitlab_version mismatch:".red
|
||||||
puts " Your current HEAD differs from the HEAD in the backup!".red
|
puts " Your current HEAD differs from the HEAD in the backup!".red
|
||||||
puts " Please switch to the following revision and try again:".red
|
puts " Please switch to the following revision and try again:".red
|
||||||
puts " revision: #{settings["gitlab_version"]}".red
|
puts " revision: #{settings[:gitlab_version]}".red
|
||||||
exit 1
|
exit 1
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue