Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

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

Merged
merged 1 commit into from

2 participants

@mizzy

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.

@mizzy mizzy 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.
71ff619
@randx randx merged commit 6e3e3e7 into gitlabhq:master
@randx randx referenced this pull request from a commit
@randx randx Merge branch 'bump_gitlab_git' into 'master'
Bump gitlab_git to rc15

For #2033

See merge request !1631
21a6944
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Nov 22, 2012
  1. @mizzy

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

    mizzy authored
    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.
This page is out of date. Refresh to see the latest.
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/tasks/gitlab/backup.rake
View
4 lib/tasks/gitlab/backup.rake
@@ -85,11 +85,11 @@ namespace :gitlab do
ENV["VERSION"] = "#{settings["db_version"]}" if settings["db_version"].to_i > 0
# 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 " Your current HEAD differs from the HEAD in the backup!".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
end
Something went wrong with that request. Please try again.