Mercurial > hg > soundsoftware-site
changeset 1299:a778eeeeec77 cannam
Merge from live branch
author | Chris Cannam |
---|---|
date | Fri, 14 Jun 2013 10:25:26 +0100 |
parents | 44475ccf56d3 (current diff) cf4cc816278a (diff) |
children | 598af7ed80ca |
files | |
diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/config/environment.rb Tue Mar 12 15:44:39 2013 +0000 +++ b/config/environment.rb Fri Jun 14 10:25:26 2013 +0100 @@ -5,7 +5,7 @@ # ENV['RAILS_ENV'] ||= 'production' # Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.3.17' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.3.18' unless defined? RAILS_GEM_VERSION if RUBY_VERSION >= '1.9' Encoding.default_external = 'UTF-8'
--- a/extra/soundsoftware/SoundSoftware.pm Tue Mar 12 15:44:39 2013 +0000 +++ b/extra/soundsoftware/SoundSoftware.pm Fri Jun 14 10:25:26 2013 +0100 @@ -550,7 +550,9 @@ $name = $repo; } - my $realm = '"Mercurial repository for ' . "'$name'" . '"'; +# my $realm = '"Mercurial repository for ' . "'$name'" . '"'; +# see #577: + my $realm = '"Mercurial repository for ' . "$name" . '"'; $realm; }