nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Initial 1.9.2, specs fail (possibly validatable), need to pull in aredridel photo fixes

Browse source
This commit is contained in:
Raphael 2010-09-24 09:49:42 -07:00
parent 70a22ae839
commit b9bff76054
3 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -47,7 +47,6 @@ group :test do
gem 'rspec-rails', '2.0.0.beta.17' gem 'rspec-rails', '2.0.0.beta.17'
gem 'mocha' gem 'mocha'
gem 'webrat', '0.7.2.beta.1' gem 'webrat', '0.7.2.beta.1'
gem 'redgreen'
gem 'autotest' gem 'autotest'
gem 'database_cleaner' gem 'database_cleaner'
gem 'saucelabs-adapter', '= 0.8.12' gem 'saucelabs-adapter', '= 0.8.12'

2
Gemfile.lock
View file

@ -180,7 +180,6 @@ GEM
rake (>= 0.8.4) rake (>= 0.8.4)
thor (~> 0.14.0) thor (~> 0.14.0)
rake (0.8.7) rake (0.8.7)
redgreen (1.2.2)
rest-client (1.6.1) rest-client (1.6.1)
mime-types (>= 1.16) mime-types (>= 1.16)
rspec (2.0.0.beta.22) rspec (2.0.0.beta.22)
@ -252,7 +251,6 @@ DEPENDENCIES
pubsubhubbub pubsubhubbub
rails (= 3.0.0) rails (= 3.0.0)
redfinger! redfinger!
redgreen
roxml! roxml!
rspec (>= 2.0.0.beta.17) rspec (>= 2.0.0.beta.17)
rspec-rails (= 2.0.0.beta.17) rspec-rails (= 2.0.0.beta.17)

15
app/models/user.rb
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
require File.expand_path('../../../lib/diaspora/user/friending', __FILE__) require File.expand_path('../../../lib/diaspora/user/friending', __FILE__)
require File.expand_path('../../../lib/diaspora/user/querying', __FILE__) require File.expand_path('../../../lib/diaspora/user/querying', __FILE__)
require File.expand_path('../../../lib/diaspora/user/receiving', __FILE__) require File.expand_path('../../../lib/diaspora/user/receiving', __FILE__)
@ -258,20 +257,6 @@ class User
aspect(:name => "Family") aspect(:name => "Family")
aspect(:name => "Work") aspect(:name => "Work")
end end
<<<<<<< HEAD
def self.create(opts ={})
puts opts.inspect
end
def terse_url
terse = self.url.gsub(/(https?:|www\.)\/\//, '')
terse = terse.chop! if terse[-1, 1] == '/'
terse
end
=======
>>>>>>> master
def diaspora_handle def diaspora_handle
"#{self.username}@#{APP_CONFIG[:terse_pod_url]}" "#{self.username}@#{APP_CONFIG[:terse_pod_url]}"