Permalink
Browse files

gemfile fix

  • Loading branch information...
1 parent 7ea5800 commit 9708aaa281949743a9c510b8330377f6956e8110 Noel Rappin committed May 9, 2012
Showing with 90 additions and 93 deletions.
  1. +90 −93 Gemfile.lock
View
@@ -1,72 +1,60 @@
-GIT
- remote: https://github.com/johnbintz/jasmine-headless-webkit.git
- revision: 634f60ffe6799723fd9f6d0c5f4e95cccc2d4a69
- branch: sprockets-integration
- specs:
- jasmine-headless-webkit (0.8.0)
- coffee-script
- jasmine-core (~> 1.1)
- multi_json
- rainbow
- sprockets (~> 2)
-
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.0.rc1)
- actionpack (= 3.2.0.rc1)
- mail (~> 2.3.0)
- actionpack (3.2.0.rc1)
- activemodel (= 3.2.0.rc1)
- activesupport (= 3.2.0.rc1)
+ actionmailer (3.2.3)
+ actionpack (= 3.2.3)
+ mail (~> 2.4.4)
+ actionpack (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- i18n (~> 0.6)
- journey (~> 1.0.0.rc1)
- rack (~> 1.3.5)
- rack-cache (~> 1.1)
+ journey (~> 1.0.1)
+ rack (~> 1.4.0)
+ rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.2)
- activemodel (3.2.0.rc1)
- activesupport (= 3.2.0.rc1)
+ activemodel (3.2.3)
+ activesupport (= 3.2.3)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.2.0.rc1)
- activemodel (= 3.2.0.rc1)
- activesupport (= 3.2.0.rc1)
- arel (~> 3.0.0.rc1)
+ activerecord (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
+ arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.0.rc1)
- activemodel (= 3.2.0.rc1)
- activesupport (= 3.2.0.rc1)
- activesupport (3.2.0.rc1)
+ activeresource (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
+ activesupport (3.2.3)
i18n (~> 0.6)
multi_json (~> 1.0)
+ addressable (2.2.8)
annotate (2.4.0)
- arel (3.0.0.rc1)
+ arel (3.0.2)
awesome_print (1.0.2)
bcrypt-ruby (3.0.1)
builder (3.0.0)
- childprocess (0.2.3)
+ childprocess (0.3.2)
ffi (~> 1.0.6)
- coffee-rails (3.2.0)
+ coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
- railties (~> 3.2.0.beta)
+ railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.2.0)
- devise (1.5.3)
+ coffee-script-source (1.3.1)
+ devise (2.0.4)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
- warden (~> 1.1)
+ railties (~> 3.1)
+ warden (~> 1.1.1)
diff-lcs (1.1.3)
ejs (1.0.0)
erubis (2.7.0)
- execjs (1.2.13)
+ execjs (1.3.2)
multi_json (~> 1.0)
ffi (1.0.11)
- haml (3.1.4)
+ haml (3.1.5)
hike (1.2.1)
i18n (0.6.0)
jasmine (1.1.2)
@@ -75,79 +63,88 @@ GEM
rspec (>= 1.3.1)
selenium-webdriver (>= 0.1.3)
jasmine-core (1.1.0)
+ jasmine-headless-webkit (0.8.4)
+ coffee-script
+ jasmine-core (~> 1.1)
+ multi_json
+ rainbow
+ sprockets (~> 2)
jasminerice (0.0.8)
haml
- journey (1.0.0.rc3)
- jquery-rails (2.0.0)
- railties (>= 3.2.0.beta, < 5.0)
+ journey (1.0.3)
+ jquery-rails (2.0.2)
+ railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
- json (1.6.4)
- mail (2.3.0)
+ json (1.7.1)
+ libwebsocket (0.1.3)
+ addressable
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.17.2)
- multi_json (1.0.4)
+ mime-types (1.18)
+ multi_json (1.3.4)
mysql2 (0.3.11)
- orm_adapter (0.0.5)
+ orm_adapter (0.0.7)
polyglot (0.3.3)
powder (0.1.7)
thor (>= 0.11.5)
- rack (1.3.5)
- rack-cache (1.1)
+ rack (1.4.1)
+ rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.2.0.rc1)
- actionmailer (= 3.2.0.rc1)
- actionpack (= 3.2.0.rc1)
- activerecord (= 3.2.0.rc1)
- activeresource (= 3.2.0.rc1)
- activesupport (= 3.2.0.rc1)
+ rails (3.2.3)
+ actionmailer (= 3.2.3)
+ actionpack (= 3.2.3)
+ activerecord (= 3.2.3)
+ activeresource (= 3.2.3)
+ activesupport (= 3.2.3)
bundler (~> 1.0)
- railties (= 3.2.0.rc1)
- rails-backbone (0.5.0)
- coffee-script (~> 2.2)
+ railties (= 3.2.3)
+ rails-backbone (0.7.2)
+ coffee-script (~> 2.2.0)
ejs (~> 1.0.0)
- rails (~> 3.1)
- railties (3.2.0.rc1)
- actionpack (= 3.2.0.rc1)
- activesupport (= 3.2.0.rc1)
+ railties (>= 3.1.0)
+ railties (3.2.3)
+ actionpack (= 3.2.3)
+ activesupport (= 3.2.3)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
- rainbow (1.1.3)
+ rainbow (1.1.4)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
- rspec (2.7.0)
- rspec-core (~> 2.7.0)
- rspec-expectations (~> 2.7.0)
- rspec-mocks (~> 2.7.0)
- rspec-core (2.7.1)
- rspec-expectations (2.7.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.7.0)
- rspec-rails (2.7.0)
- actionpack (~> 3.0)
- activesupport (~> 3.0)
- railties (~> 3.0)
- rspec (~> 2.7.0)
- rubyzip (0.9.5)
- sass (3.1.12)
- sass-rails (3.2.2)
- railties (~> 3.2.0.beta)
+ rspec (2.10.0)
+ rspec-core (~> 2.10.0)
+ rspec-expectations (~> 2.10.0)
+ rspec-mocks (~> 2.10.0)
+ rspec-core (2.10.0)
+ rspec-expectations (2.10.0)
+ diff-lcs (~> 1.1.3)
+ rspec-mocks (2.10.1)
+ rspec-rails (2.10.1)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ railties (>= 3.0)
+ rspec (~> 2.10.0)
+ rubyzip (0.9.8)
+ sass (3.1.17)
+ sass-rails (3.2.5)
+ railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.15.0)
- childprocess (>= 0.2.1)
- ffi (~> 1.0.9)
- multi_json (~> 1.0.4)
+ selenium-webdriver (2.21.2)
+ childprocess (>= 0.2.5)
+ ffi (~> 1.0)
+ libwebsocket (~> 0.1.3)
+ multi_json (~> 1.0)
rubyzip
- sprockets (2.1.2)
+ sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
@@ -156,11 +153,11 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.31)
- uglifier (1.2.0)
+ tzinfo (0.3.33)
+ uglifier (1.2.4)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
- warden (1.1.0)
+ warden (1.1.1)
rack (>= 1.0)
PLATFORMS
@@ -172,12 +169,12 @@ DEPENDENCIES
coffee-rails
devise
jasmine
- jasmine-headless-webkit!
+ jasmine-headless-webkit
jasminerice
jquery-rails
mysql2
powder
- rails (= 3.2.0.rc1)
+ rails (= 3.2.3)
rails-backbone
rspec-rails
sass-rails

0 comments on commit 9708aaa

Please sign in to comment.