Merge branch 'release/0.6.7'

Conflicts:
  locale/cs/app.po
  locale/ro_RO/app.po

2 files changed, 2 insertions, 2 deletions

diff --git a/db/migrate/074_create_holidays.rb b/db/migrate/074_create_holidays.rb
index 46b1ab684..f2197e89e 100644
--- a/db/migrate/074_create_holidays.rb
+++ b/db/migrate/074_create_holidays.rb
@@ -59,7 +59,7 @@ class CreateHolidays < ActiveRecord::Migration
         '2010-12-28' => "Boxing Day"
     }
 
-    holidays.sort.each { |date, desc| 
+    holidays.sort.each { |date, desc|
       Holiday.create :day => date, :description => desc
     }
 
diff --git a/db/migrate/101_add_hash_to_info_request.rb b/db/migrate/101_add_hash_to_info_request.rb
index 20608aac1..e21bf0989 100644
--- a/db/migrate/101_add_hash_to_info_request.rb
+++ b/db/migrate/101_add_hash_to_info_request.rb
@@ -6,7 +6,7 @@ class AddHashToInfoRequest < ActiveRecord::Migration
 
         # Create the missing events for requests already sent
         InfoRequest.find(:all).each do |info_request|
-            info_request.idhash = Digest::SHA1.hexdigest(info_request.id.to_s + MySociety::Config.get("INCOMING_EMAIL_SECRET", 'dummysecret'))[0,8]
+            info_request.idhash = Digest::SHA1.hexdigest(info_request.id.to_s + Configuration::incoming_email_secret)[0,8]
             info_request.save!
             puts info_request.idhash
         end