Download as
Browse Code »

Commit 6e3e3e7fd2a2dbbe736f43c1d201da68a57e9490

Authored by Dmitriy Zaporozhets
2 parents 9e8aadb0 71ff6199
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #2033 from mizzy/fix-hash-key-in-backup.rake 

Fix hash key settings["gitlab_version"] to settings[:gitlab_version]
Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
lib/tasks/gitlab/backup.rake
  Diff comments   View file @6e3e3e7
@@ -85,11 +85,11 @@ namespace :gitlab do @@ -85,11 +85,11 @@ namespace :gitlab do
85 ENV["VERSION"] = "#{settings["db_version"]}" if settings["db_version"].to_i > 0 85 ENV["VERSION"] = "#{settings["db_version"]}" if settings["db_version"].to_i > 0
86 86
87 # restoring mismatching backups can lead to unexpected problems 87 # restoring mismatching backups can lead to unexpected problems
88 - if settings["gitlab_version"] != %x{git rev-parse HEAD}.gsub(/\n/,"") 88 + if settings[:gitlab_version] != %x{git rev-parse HEAD}.gsub(/\n/,"")
89 puts "gitlab_version mismatch:".red 89 puts "gitlab_version mismatch:".red
90 puts " Your current HEAD differs from the HEAD in the backup!".red 90 puts " Your current HEAD differs from the HEAD in the backup!".red
91 puts " Please switch to the following revision and try again:".red 91 puts " Please switch to the following revision and try again:".red
92 - puts " revision: #{settings["gitlab_version"]}".red 92 + puts " revision: #{settings[:gitlab_version]}".red
93 exit 1 93 exit 1
94 end 94 end
95 95