Skip to content
Browse files

Merge branch 'rails3013' into v1.x

  • Loading branch information...
2 parents 5d53b93 + dee422e commit 5c26600831d9887104851286dabc9850ec2589d2 @chrismear chrismear committed
Showing with 55 additions and 48 deletions.
  1. +4 −3 Gemfile
  2. +51 −45 Gemfile.lock
View
7 Gemfile
@@ -2,7 +2,7 @@ source 'http://rubygems.org'
gem "bundler", "~>1.1.3"
-gem "rails", "3.0.12"
+gem "rails", "3.0.13"
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -59,10 +59,11 @@ group :development, :test do
gem "webrat"
gem "machinist", "~>1.0.6"
gem "faker", '~>0.3.1'
- gem "rcov"
+ gem "rcov", :platforms => :ruby_18
+ gem "simplecov", :platforms => :ruby_19
gem "cucumber-rails", "~>0.4.1", :require => nil
gem "capybara", "~>0.4.1.2"
gem "database_cleaner"
gem "launchy"
- gem "selenium-webdriver", "~>2.19.0"
+ gem "selenium-webdriver", "~>2.22.1"
end
View
96 Gemfile.lock
@@ -2,12 +2,12 @@ GEM
remote: http://rubygems.org/
specs:
abstract (1.0.0)
- actionmailer (3.0.12)
- actionpack (= 3.0.12)
+ actionmailer (3.0.13)
+ actionpack (= 3.0.13)
mail (~> 2.2.19)
- actionpack (3.0.12)
- activemodel (= 3.0.12)
- activesupport (= 3.0.12)
+ actionpack (3.0.13)
+ activemodel (= 3.0.13)
+ activesupport (= 3.0.13)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.5.0)
@@ -15,20 +15,20 @@ GEM
rack-mount (~> 0.6.14)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
- activemodel (3.0.12)
- activesupport (= 3.0.12)
+ activemodel (3.0.13)
+ activesupport (= 3.0.13)
builder (~> 2.1.2)
i18n (~> 0.5.0)
- activerecord (3.0.12)
- activemodel (= 3.0.12)
- activesupport (= 3.0.12)
+ activerecord (3.0.13)
+ activemodel (= 3.0.13)
+ activesupport (= 3.0.13)
arel (~> 2.0.10)
tzinfo (~> 0.3.23)
- activeresource (3.0.12)
- activemodel (= 3.0.12)
- activesupport (= 3.0.12)
- activesupport (3.0.12)
- addressable (2.2.7)
+ activeresource (3.0.13)
+ activemodel (= 3.0.13)
+ activesupport (= 3.0.13)
+ activesupport (3.0.13)
+ addressable (2.2.8)
archive-tar-minitar (0.5.2)
arel (2.0.10)
builder (2.1.2)
@@ -48,16 +48,15 @@ GEM
selenium-webdriver (>= 0.0.27)
xpath (~> 0.1.3)
celerity (0.9.2)
- childprocess (0.3.1)
+ childprocess (0.3.2)
ffi (~> 1.0.6)
coderay (1.0.6)
columnize (0.3.6)
- cucumber (1.1.9)
+ cucumber (1.2.0)
builder (>= 2.1.2)
- diff-lcs (>= 1.1.2)
- gherkin (~> 2.9.0)
+ diff-lcs (>= 1.1.3)
+ gherkin (~> 2.10.0)
json (>= 1.4.6)
- term-ansicolor (>= 1.0.6)
cucumber-rails (0.4.1)
cucumber (>= 0.10.1)
nokogiri (>= 1.4.4)
@@ -73,16 +72,18 @@ GEM
abstract (>= 1.0.0)
exception_notification_rails3 (1.2.0)
faker (0.3.1)
- fastercsv (1.5.4)
+ fastercsv (1.5.5)
ffi (1.0.11)
- gherkin (2.9.3)
+ gherkin (2.10.0)
json (>= 1.4.6)
haml (3.0.25)
- highline (1.6.11)
+ highline (1.6.12)
i18n (0.5.0)
- json (1.6.6)
+ json (1.7.3)
launchy (2.1.0)
addressable (~> 2.2.6)
+ libwebsocket (0.1.3)
+ addressable
linecache (0.46)
rbx-require-relative (> 0.0.4)
linecache19 (0.5.12)
@@ -95,19 +96,19 @@ GEM
treetop (~> 1.4.8)
method_source (0.7.1)
mime-types (1.18)
- multi_json (1.0.4)
+ multi_json (1.3.6)
mysql (2.8.1)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
- net-ssh (2.3.0)
+ net-ssh (2.5.2)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
- nokogiri (1.5.2)
+ nokogiri (1.5.3)
pdfkit (0.5.2)
polyglot (0.3.3)
- pry (0.9.8.4)
+ pry (0.9.9.6)
coderay (~> 1.0.5)
method_source (~> 0.7.1)
slop (>= 2.4.4, < 3)
@@ -117,17 +118,17 @@ GEM
rack-test (0.5.7)
rack (>= 1.0)
railroad (0.5.0)
- rails (3.0.12)
- actionmailer (= 3.0.12)
- actionpack (= 3.0.12)
- activerecord (= 3.0.12)
- activeresource (= 3.0.12)
- activesupport (= 3.0.12)
+ rails (3.0.13)
+ actionmailer (= 3.0.13)
+ actionpack (= 3.0.13)
+ activerecord (= 3.0.13)
+ activeresource (= 3.0.13)
+ activesupport (= 3.0.13)
bundler (~> 1.0)
- railties (= 3.0.12)
- railties (3.0.12)
- actionpack (= 3.0.12)
- activesupport (= 3.0.12)
+ railties (= 3.0.13)
+ railties (3.0.13)
+ actionpack (= 3.0.13)
+ activesupport (= 3.0.13)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.4)
@@ -165,14 +166,18 @@ GEM
ruby-debug-base19 (>= 0.11.19)
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
- rubyzip (0.9.7)
- selenium-webdriver (2.19.0)
+ rubyzip (0.9.8)
+ selenium-webdriver (2.22.1)
childprocess (>= 0.2.5)
- ffi (~> 1.0.9)
- multi_json (~> 1.0.4)
+ ffi (~> 1.0)
+ libwebsocket (~> 0.1.3)
+ multi_json (~> 1.0)
rubyzip
+ simplecov (0.6.4)
+ multi_json (~> 1.0)
+ simplecov-html (~> 0.5.3)
+ simplecov-html (0.5.3)
slop (2.4.4)
- term-ansicolor (1.0.7)
thor (0.14.6)
treetop (1.4.10)
polyglot
@@ -207,11 +212,12 @@ DEPENDENCIES
pdfkit (~> 0.5.2)
pry
railroad
- rails (= 3.0.12)
+ rails (= 3.0.13)
rcov
rdiscount (~> 1.6.8)
rspec-rails (~> 2.8.1)
ruby-debug
ruby-debug19
- selenium-webdriver (~> 2.19.0)
+ selenium-webdriver (~> 2.22.1)
+ simplecov
webrat

0 comments on commit 5c26600

Please sign in to comment.
Something went wrong with that request. Please try again.