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

2010-08-24 13:43:59 -07:00 · 2010-08-24 13:43:59 -07:00 · fa6e12d808
commit fa6e12d808
parent 79be6f0628 abf48cefd4
1 changed files with 5 additions and 2 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -224,8 +224,11 @@ class User
  end

  protected
-  
-  def generate_key
+   def generate_key
+    OpenSSL::PKey::RSA::generate 1024 
+  end 
+
+  def self.generate_key
    OpenSSL::PKey::RSA::generate 1024 
  end