merged master

This commit is contained in:
sfischme 2011-09-23 18:32:12 -04:00
parent 6f8d9ec2ae
commit f91a2867b2
2 changed files with 9 additions and 20 deletions

View file

@ -16,7 +16,6 @@ gem "actionwebservice", :git => "git://github.com/dejan/actionwebservice.git"
gem "rubycas-client", "~>2.2.1"
gem "ruby-openid", :require => "openid"
gem "sqlite3"
gem "ruby-debug"
gem 'bcrypt-ruby', '~> 2.1.4'
gem "webrat", ">=0.7.0", :groups => [:cucumber, :test]

View file

@ -11,8 +11,8 @@ GEM
remote: http://gems.github.com/
specs:
RedCloth (4.2.3)
ZenTest (4.6.2)
aasm (2.2.1)
ZenTest (4.6.1)
aasm (2.2.0)
actionmailer (2.3.14)
actionpack (= 2.3.14)
actionpack (2.3.14)
@ -27,33 +27,30 @@ GEM
bcrypt-ruby (2.1.4)
builder (3.0.0)
cgi_multipart_eof_fix (2.5.0)
columnize (0.3.4)
cucumber (1.0.6)
cucumber (1.0.2)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
gherkin (~> 2.4.18)
gherkin (~> 2.4.5)
json (>= 1.4.6)
term-ansicolor (>= 1.0.6)
term-ansicolor (>= 1.0.5)
cucumber-rails (0.3.2)
cucumber (>= 0.8.0)
daemons (1.1.4)
database_cleaner (0.6.7)
diff-lcs (1.1.3)
diff-lcs (1.1.2)
fastthread (1.0.7)
flexmock (0.9.0)
gem_plugin (0.2.3)
gherkin (2.4.18)
gherkin (2.4.11)
json (>= 1.4.6)
has_many_polymorphs (2.13)
activerecord
highline (1.5.2)
hoe (2.12.3)
hoe (2.12.0)
rake (~> 0.8)
hpricot (0.8.4)
httpclient (2.2.1)
json (1.6.0)
linecache (0.46)
rbx-require-relative (> 0.0.4)
json (1.5.3)
memory_test_fix (0.1.3)
mongrel (1.1.5)
cgi_multipart_eof_fix (>= 2.4)
@ -72,16 +69,10 @@ GEM
activesupport (= 2.3.14)
rake (>= 0.8.3)
rake (0.8.7)
rbx-require-relative (0.0.5)
rspec (1.3.2)
rspec-rails (1.3.4)
rack (>= 1.0.0)
rspec (~> 1.3.1)
ruby-debug (0.10.4)
columnize (>= 0.1)
ruby-debug-base (~> 0.10.4.0)
ruby-debug-base (0.10.4)
linecache (>= 0.3)
ruby-openid (2.1.8)
rubycas-client (2.2.1)
activesupport
@ -122,7 +113,6 @@ DEPENDENCIES
rails (~> 2.3.12)
rake (~> 0.8.7)
rspec-rails (~> 1.3.3)
ruby-debug
ruby-openid
rubycas-client (~> 2.2.1)
sanitize (~> 1.2.1)