Permalink
Browse files

Update rails to 3.0.5

Also re-ordered gem list alphabetically and updated the already bundled
gems
  • Loading branch information...
1 parent 1f51719 commit 3a3e63860985c7f65c9af4cad003f575d8f2974d @martinisoft martinisoft committed Mar 7, 2011
Showing with 40 additions and 44 deletions.
  1. +3 −10 Gemfile
  2. +37 −34 Gemfile.lock
View
13 Gemfile
@@ -1,27 +1,20 @@
source 'http://rubygems.org'
-gem 'rails', '3.0.4'
-
-gem 'devise'
-
+gem 'carrierwave'
gem 'decent_exposure'
+gem 'devise'
gem 'escape_utils'
-
gem 'formtastic', '1.2.3'
-
gem 'haml'
gem 'haml-rails'
-
gem 'pg'
-
+gem 'rails', '3.0.5'
gem 'state_machine', '0.9.4'
# My Nokogiri brings all the comics to the yard
gem 'nokogiri'
-
# Hoptoad for error capture
gem 'hoptoad_notifier'
-
# Just for Heroku, to serve things out of /tmp for stylesheets
gem 'hassle', :git => "git://github.com/koppen/hassle.git"
View
71 Gemfile.lock
@@ -10,34 +10,34 @@ GEM
remote: http://rubygems.org/
specs:
abstract (1.0.0)
- actionmailer (3.0.4)
- actionpack (= 3.0.4)
+ actionmailer (3.0.5)
+ actionpack (= 3.0.5)
mail (~> 2.2.15)
- actionpack (3.0.4)
- activemodel (= 3.0.4)
- activesupport (= 3.0.4)
+ actionpack (3.0.5)
+ activemodel (= 3.0.5)
+ activesupport (= 3.0.5)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.4)
rack (~> 1.2.1)
rack-mount (~> 0.6.13)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
- activemodel (3.0.4)
- activesupport (= 3.0.4)
+ activemodel (3.0.5)
+ activesupport (= 3.0.5)
builder (~> 2.1.2)
i18n (~> 0.4)
- activerecord (3.0.4)
- activemodel (= 3.0.4)
- activesupport (= 3.0.4)
+ activerecord (3.0.5)
+ activemodel (= 3.0.5)
+ activesupport (= 3.0.5)
arel (~> 2.0.2)
tzinfo (~> 0.3.23)
- activeresource (3.0.4)
- activemodel (= 3.0.4)
- activesupport (= 3.0.4)
- activesupport (3.0.4)
+ activeresource (3.0.5)
+ activemodel (= 3.0.5)
+ activesupport (= 3.0.5)
+ activesupport (3.0.5)
archive-tar-minitar (0.5.2)
- arel (2.0.8)
+ arel (2.0.9)
bcrypt-ruby (2.1.4)
builder (2.1.2)
capybara (0.3.9)
@@ -47,7 +47,9 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (>= 0.0.3)
- childprocess (0.1.6)
+ carrierwave (0.5.2)
+ activesupport (~> 3.0)
+ childprocess (0.1.7)
ffi (~> 0.6.3)
columnize (0.3.2)
configuration (1.2.0)
@@ -60,17 +62,17 @@ GEM
cucumber-rails (0.3.2)
cucumber (>= 0.8.0)
culerity (0.2.15)
- database_cleaner (0.6.3)
- decent_exposure (1.0.0)
- devise (1.1.5)
+ database_cleaner (0.6.4)
+ decent_exposure (1.0.1)
+ devise (1.1.7)
bcrypt-ruby (~> 2.1.2)
warden (~> 1.0.2)
diff-lcs (1.1.2)
email_spec (1.1.1)
rspec (~> 2.0)
erubis (2.6.6)
abstract (>= 1.0.0)
- escape_utils (0.2.0)
+ escape_utils (0.2.2)
factory_girl (1.3.3)
factory_girl_rails (1.0.1)
factory_girl (~> 1.3)
@@ -93,13 +95,13 @@ GEM
activesupport (~> 3.0)
haml (~> 3.0)
railties (~> 3.0)
- hoptoad_notifier (2.4.5)
+ hoptoad_notifier (2.4.6)
activesupport
builder
i18n (0.5.0)
json (1.4.6)
json_pure (1.5.1)
- launchy (0.3.7)
+ launchy (0.4.0)
configuration (>= 0.0.5)
rake (>= 0.8.1)
linecache19 (0.5.11)
@@ -118,17 +120,17 @@ GEM
rack (>= 1.0.0)
rack-test (0.5.7)
rack (>= 1.0)
- rails (3.0.4)
- actionmailer (= 3.0.4)
- actionpack (= 3.0.4)
- activerecord (= 3.0.4)
- activeresource (= 3.0.4)
- activesupport (= 3.0.4)
+ rails (3.0.5)
+ actionmailer (= 3.0.5)
+ actionpack (= 3.0.5)
+ activerecord (= 3.0.5)
+ activeresource (= 3.0.5)
+ activesupport (= 3.0.5)
bundler (~> 1.0)
- railties (= 3.0.4)
- railties (3.0.4)
- actionpack (= 3.0.4)
- activesupport (= 3.0.4)
+ railties (= 3.0.5)
+ railties (3.0.5)
+ actionpack (= 3.0.5)
+ activesupport (= 3.0.5)
rake (>= 0.8.7)
thor (~> 0.14.4)
rake (0.8.7)
@@ -158,7 +160,7 @@ GEM
ruby_core_source (0.1.4)
archive-tar-minitar (>= 0.5.2)
rubyzip (0.9.4)
- selenium-webdriver (0.1.2)
+ selenium-webdriver (0.1.3)
childprocess (~> 0.1.5)
ffi (~> 0.6.3)
json_pure
@@ -178,6 +180,7 @@ PLATFORMS
DEPENDENCIES
capybara (= 0.3.9)
+ carrierwave
cucumber-rails
database_cleaner
decent_exposure
@@ -194,7 +197,7 @@ DEPENDENCIES
launchy
nokogiri
pg
- rails (= 3.0.4)
+ rails (= 3.0.5)
rspec (= 2.3.0)
rspec-rails (= 2.3.0)
ruby-debug19

0 comments on commit 3a3e638

Please sign in to comment.