Permalink
Browse files

Update dependencies.

  • Loading branch information...
1 parent 013b720 commit 910232bda7cd2462413357e8a4237f60ce9a1f06 @tristandunn committed Feb 17, 2013
Showing with 53 additions and 57 deletions.
  1. +4 −4 Gemfile
  2. +49 −53 Gemfile.lock
View
@@ -1,7 +1,7 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
gem "dynamic_form", "1.1.4"
-gem "rails", "3.2.11"
+gem "rails", "3.2.12"
gem "sqlite3", "1.3.7"
group :assets do
@@ -16,7 +16,7 @@ end
group :test do
gem "cucumber-rails", "1.3.0", require: false
gem "database_cleaner", "0.9.1"
- gem "factory_girl_rails", "4.1.0"
+ gem "factory_girl_rails", "4.2.1"
gem "rspec-rails", "2.12.2"
- gem "timecop", "0.5.9"
+ gem "timecop", "0.5.9.2"
end
View
@@ -1,38 +1,37 @@
GEM
- remote: http://rubygems.org/
+ remote: https://rubygems.org/
specs:
POpen4 (0.1.4)
Platform (>= 0.4.0)
open4
Platform (0.4.0)
- actionmailer (3.2.11)
- actionpack (= 3.2.11)
+ actionmailer (3.2.12)
+ actionpack (= 3.2.12)
mail (~> 2.4.4)
- actionpack (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ actionpack (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
- rack (~> 1.4.0)
+ rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.11)
- activesupport (= 3.2.11)
+ activemodel (3.2.12)
+ activesupport (= 3.2.12)
builder (~> 3.0.0)
- activerecord (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ activerecord (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
- activesupport (3.2.11)
+ activeresource (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
+ activesupport (3.2.12)
i18n (~> 0.6)
multi_json (~> 1.0)
- addressable (2.3.2)
arel (3.0.2)
builder (3.0.4)
capybara (2.0.2)
@@ -42,8 +41,8 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 1.0.0)
- childprocess (0.3.6)
- ffi (~> 1.0, >= 1.0.6)
+ childprocess (0.3.8)
+ ffi (~> 1.0, >= 1.0.11)
cucumber (1.2.1)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
@@ -57,59 +56,56 @@ GEM
diff-lcs (1.1.3)
dynamic_form (1.1.4)
erubis (2.7.0)
- factory_girl (4.1.0)
+ factory_girl (4.2.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.1.0)
- factory_girl (~> 4.1.0)
+ factory_girl_rails (4.2.1)
+ factory_girl (~> 4.2.0)
railties (>= 3.0.0)
- ffi (1.3.1)
- gherkin (2.11.5)
- json (>= 1.4.6)
+ ffi (1.4.0)
+ gherkin (2.11.6)
+ json (>= 1.7.6)
hike (1.2.1)
i18n (0.6.1)
journey (1.0.4)
- json (1.7.6)
- libwebsocket (0.1.7.1)
- addressable
- websocket
+ json (1.7.7)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.19)
- multi_json (1.5.0)
+ mime-types (1.21)
+ multi_json (1.6.1)
nokogiri (1.5.6)
open4 (1.3.0)
polyglot (0.3.3)
- rack (1.4.4)
+ rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
- rack-ssl (1.3.2)
+ rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.11)
- actionmailer (= 3.2.11)
- actionpack (= 3.2.11)
- activerecord (= 3.2.11)
- activeresource (= 3.2.11)
- activesupport (= 3.2.11)
+ rails (3.2.12)
+ actionmailer (= 3.2.12)
+ actionpack (= 3.2.12)
+ activerecord (= 3.2.12)
+ activeresource (= 3.2.12)
+ activesupport (= 3.2.12)
bundler (~> 1.0)
- railties (= 3.2.11)
- railties (3.2.11)
- actionpack (= 3.2.11)
- activesupport (= 3.2.11)
+ railties (= 3.2.12)
+ railties (3.2.12)
+ actionpack (= 3.2.12)
+ activesupport (= 3.2.12)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.0.3)
- rdoc (3.12)
+ rdoc (3.12.1)
json (~> 1.4)
rspec-core (2.12.2)
rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
- rspec-mocks (2.12.1)
+ rspec-mocks (2.12.2)
rspec-rails (2.12.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
@@ -123,25 +119,25 @@ GEM
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.27.2)
+ selenium-webdriver (2.29.0)
childprocess (>= 0.2.5)
- libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
+ websocket (~> 1.0.4)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.7)
- thor (0.16.0)
+ thor (0.17.0)
tilt (1.3.3)
- timecop (0.5.9)
+ timecop (0.5.9.2)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.35)
- websocket (1.0.6)
+ websocket (1.0.7)
xpath (1.0.0)
nokogiri (~> 1.3)
yui-compressor (0.9.6)
@@ -154,10 +150,10 @@ DEPENDENCIES
cucumber-rails (= 1.3.0)
database_cleaner (= 0.9.1)
dynamic_form (= 1.1.4)
- factory_girl_rails (= 4.1.0)
- rails (= 3.2.11)
+ factory_girl_rails (= 4.2.1)
+ rails (= 3.2.12)
rspec-rails (= 2.12.2)
sass-rails (= 3.2.6)
sqlite3 (= 1.3.7)
- timecop (= 0.5.9)
+ timecop (= 0.5.9.2)
yui-compressor (= 0.9.6)

0 comments on commit 910232b

Please sign in to comment.