Download as
Browse Code »

Commit 71ff619973d52c22e49303883aaa77801be378c7

Authored by Gosuke Miyashita
1 parent 9e8aadb0
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix hash key settings["gitlab_version"] to settings[:gitlab_version] 

In backup_create, backup information hash is using symbol as its key.
But in backup_restore, string key is used and it returns empty value.
Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
lib/tasks/gitlab/backup.rake
  Diff comments   View file @71ff619
... ... @@ -85,11 +85,11 @@ namespace :gitlab do
85 85 ENV["VERSION"] = "#{settings["db_version"]}" if settings["db_version"].to_i > 0
86 86  
87 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 89 puts "gitlab_version mismatch:".red
90 90 puts " Your current HEAD differs from the HEAD in the backup!".red
91 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 93 exit 1
94 94 end
95 95  
... ...