Permalink
Browse files

Bumping up to Rails 3.2

  • Loading branch information...
1 parent 66c7406 commit 4eb640a9f12ab86b58cccb976c05b0e127deab22 @jcasimir jcasimir committed Jan 26, 2012
View
@@ -1,13 +1,13 @@
source 'http://rubygems.org'
-gem 'rails', '3.1.3'
+gem 'rails', '3.2.0'
gem 'sqlite3'
gem 'jquery-rails'
group :assets do
- gem 'sass-rails', '~> 3.1.5'
- gem 'coffee-rails', '~> 3.1.1'
- gem 'uglifier', '>= 1.0.3'
+ gem 'sass-rails'
+ gem 'coffee-rails'
+ gem 'uglifier'
end
group :development, :test do
View
@@ -1,36 +1,35 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.3)
- actionpack (= 3.1.3)
- mail (~> 2.3.0)
- actionpack (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
+ actionmailer (3.2.0)
+ actionpack (= 3.2.0)
+ mail (~> 2.4.0)
+ actionpack (3.2.0)
+ activemodel (= 3.2.0)
+ activesupport (= 3.2.0)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.5)
+ journey (~> 1.0.0)
+ rack (~> 1.4.0)
rack-cache (~> 1.1)
- rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.3)
- activemodel (3.1.3)
- activesupport (= 3.1.3)
+ sprockets (~> 2.1.2)
+ activemodel (3.2.0)
+ activesupport (= 3.2.0)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
- arel (~> 2.2.1)
+ activerecord (3.2.0)
+ activemodel (= 3.2.0)
+ activesupport (= 3.2.0)
+ arel (~> 3.0.0)
tzinfo (~> 0.3.29)
- activeresource (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
- activesupport (3.1.3)
+ activeresource (3.2.0)
+ activemodel (= 3.2.0)
+ activesupport (= 3.2.0)
+ activesupport (3.2.0)
+ i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.6)
- arel (2.2.1)
+ arel (3.0.0)
builder (3.0.0)
capybara (1.1.2)
mime-types (>= 1.16)
@@ -39,65 +38,64 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- childprocess (0.2.6)
+ childprocess (0.3.0)
ffi (~> 1.0.6)
- coffee-rails (3.1.1)
+ coffee-rails (3.2.1)
coffee-script (>= 2.2.0)
- railties (~> 3.1.0)
+ railties (~> 3.2.0.beta)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.2.0)
- database_cleaner (0.7.0)
+ database_cleaner (0.7.1)
diff-lcs (1.1.3)
erubis (2.7.0)
- execjs (1.2.13)
+ execjs (1.3.0)
multi_json (~> 1.0)
fabrication (1.2.0)
faker (1.0.1)
i18n (~> 0.4)
ffi (1.0.11)
- guard (0.10.0)
+ guard (1.0.0)
ffi (>= 0.5.0)
thor (~> 0.14.6)
guard-rspec (0.6.0)
guard (>= 0.10.0)
hike (1.2.1)
i18n (0.6.0)
- jquery-rails (1.0.19)
- railties (~> 3.0)
+ journey (1.0.0)
+ jquery-rails (2.0.0)
+ railties (>= 3.2.0.beta, < 5.0)
thor (~> 0.14)
- json (1.6.4)
+ json (1.6.5)
launchy (2.0.5)
addressable (~> 2.2.6)
- mail (2.3.0)
+ mail (2.4.1)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.17.2)
multi_json (1.0.4)
nokogiri (1.5.0)
polyglot (0.3.3)
- rack (1.3.6)
+ rack (1.4.1)
rack-cache (1.1)
rack (>= 0.4)
- rack-mount (0.8.3)
- rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.3)
- actionmailer (= 3.1.3)
- actionpack (= 3.1.3)
- activerecord (= 3.1.3)
- activeresource (= 3.1.3)
- activesupport (= 3.1.3)
+ rails (3.2.0)
+ actionmailer (= 3.2.0)
+ actionpack (= 3.2.0)
+ activerecord (= 3.2.0)
+ activeresource (= 3.2.0)
+ activesupport (= 3.2.0)
bundler (~> 1.0)
- railties (= 3.1.3)
- railties (3.1.3)
- actionpack (= 3.1.3)
- activesupport (= 3.1.3)
+ railties (= 3.2.0)
+ railties (3.2.0)
+ actionpack (= 3.2.0)
+ activesupport (= 3.2.0)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -120,17 +118,16 @@ GEM
rspec (~> 2.8.0)
rubyzip (0.9.5)
sass (3.1.12)
- sass-rails (3.1.5)
- actionpack (~> 3.1.0)
- railties (~> 3.1.0)
- sass (~> 3.1.10)
- tilt (~> 1.3.2)
- selenium-webdriver (2.16.0)
+ sass-rails (3.2.3)
+ railties (~> 3.2.0.beta)
+ sass (>= 3.1.10)
+ tilt (~> 1.3)
+ selenium-webdriver (2.17.0)
childprocess (>= 0.2.5)
ffi (~> 1.0.9)
multi_json (~> 1.0.4)
rubyzip
- sprockets (2.0.3)
+ sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
@@ -141,7 +138,7 @@ GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.31)
- uglifier (1.2.1)
+ uglifier (1.2.2)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
xpath (0.1.4)
@@ -152,16 +149,16 @@ PLATFORMS
DEPENDENCIES
capybara
- coffee-rails (~> 3.1.1)
+ coffee-rails
database_cleaner
fabrication
faker
guard
guard-rspec
jquery-rails
launchy
- rails (= 3.1.3)
+ rails (= 3.2.0)
rspec-rails
- sass-rails (~> 3.1.5)
+ sass-rails
sqlite3
- uglifier (>= 1.0.3)
+ uglifier
@@ -1,15 +0,0 @@
-class CreateComments < ActiveRecord::Migration
- def self.up
- create_table :comments do |t|
- t.integer :article_id
- t.string :author_name
- t.text :body
-
- t.timestamps
- end
- end
-
- def self.down
- drop_table :comments
- end
-end
@@ -1,14 +0,0 @@
-class CreateTaggings < ActiveRecord::Migration
- def self.up
- create_table :taggings do |t|
- t.integer :article_id
- t.integer :tag_id
-
- t.timestamps
- end
- end
-
- def self.down
- drop_table :taggings
- end
-end
@@ -1,13 +0,0 @@
-class CreateTags < ActiveRecord::Migration
- def self.up
- create_table :tags do |t|
- t.string :name
-
- t.timestamps
- end
- end
-
- def self.down
- drop_table :tags
- end
-end

0 comments on commit 4eb640a

Please sign in to comment.