Merge branch 'master' of git://github.com/diaspora/diaspora

config/app_config.yml.example

@@ -91,6 +91,7 @@ default:
   #s3_key: 'key'
   #s3_secret: 'secret'
   #s3_bucket: 'my_photos'
+  s3_region: 'us-east-1'
 
   # If you want normal Rails logs, set this to false in the appropriate environment.
   # It is false by default in development and test.

config/initializers/carrierwave.rb

@@ -3,11 +3,12 @@
 #   the COPYRIGHT file.
 
 CarrierWave.configure do |config|
-  if AppConfig[:s3_key] && AppConfig[:s3_secret] && AppConfig[:s3_bucket]
+  if AppConfig[:s3_key] && AppConfig[:s3_secret] && AppConfig[:s3_bucket] && AppConfig[:s3_region]
     config.storage = :s3
     config.s3_access_key_id = AppConfig[:s3_key]
     config.s3_secret_access_key = AppConfig[:s3_secret]
     config.s3_bucket = AppConfig[:s3_bucket]
+    config.s3_region = AppConfig[:s3_region]
     config.s3_use_ssl = true
     config.cache_dir = "#{Rails.root}/tmp/uploads"
   else

db/migrate/20110518010050_disable_password_reset_for_accounts_without_usernames.rb

@@ -0,0 +1,15 @@
+class DisablePasswordResetForAccountsWithoutUsernames < ActiveRecord::Migration
+  def self.up
+    execute <<SQL
+      UPDATE users
+        SET email = ""
+      WHERE username IS NULL
+        AND invitation_identifier IS NOT NULL
+        AND invitation_service = 'email'
+SQL
+  end
+
+  def self.down
+    raise ActiveRecord::IrreversibleMigration.new
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110517180148) do
+ActiveRecord::Schema.define(:version => 20110518010050) do
 
   create_table "aspect_memberships", :force => true do |t|
     t.integer  "aspect_id",  :null => false