Skip to content

Commit

Permalink
Updates for Rails 3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
BrittTheIsh authored and drnic committed Sep 19, 2012
1 parent 7c67112 commit 89b69b9
Show file tree
Hide file tree
Showing 5 changed files with 78 additions and 60 deletions.
5 changes: 3 additions & 2 deletions Gemfile
@@ -1,9 +1,11 @@
source 'http://rubygems.org' source 'http://rubygems.org'


gem 'rails', '3.0.9' gem "rails", "3.2.0.rc1", :git => "git://github.com/rails/rails.git", :branch => "3-2-stable"


gem 'simple_form', '1.5.1' gem 'simple_form', '1.5.1'
gem 'jquery-rails', '1.0.14' gem 'jquery-rails', '1.0.14'
gem 'rails_autolink'



platform :ruby do platform :ruby do
gem 'mysql2', '~> 0.2.7' gem 'mysql2', '~> 0.2.7'
Expand All @@ -26,7 +28,6 @@ group :rbx do
gem 'puma' gem 'puma'
end end



# Bundle gems for the local environment. Make sure to # Bundle gems for the local environment. Make sure to
# put test-only gems in this group so their generators # put test-only gems in this group so their generators
# and rake tasks are available in development mode: # and rake tasks are available in development mode:
Expand Down
120 changes: 68 additions & 52 deletions Gemfile.lock
@@ -1,52 +1,75 @@
GIT
remote: git://github.com/rails/rails.git
revision: f2e65b7d54c3034b35a5f248f2482e760cd85cd5
branch: 3-2-stable
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)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.0.rc1)
rack (~> 1.3.5)
rack-cache (~> 1.1)
rack-test (~> 0.6.1)
sprockets (~> 2.1.2)
activemodel (3.2.0.rc1)
activesupport (= 3.2.0.rc1)
builder (~> 3.0.0)
activerecord (3.2.0.rc1)
activemodel (= 3.2.0.rc1)
activesupport (= 3.2.0.rc1)
arel (~> 3.0.0.rc1)
tzinfo (~> 0.3.29)
activeresource (3.2.0.rc1)
activemodel (= 3.2.0.rc1)
activesupport (= 3.2.0.rc1)
activesupport (3.2.0.rc1)
i18n (~> 0.6)
multi_json (~> 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)
bundler (~> 1.0)
railties (= 3.2.0.rc1)
railties (3.2.0.rc1)
actionpack (= 3.2.0.rc1)
activesupport (= 3.2.0.rc1)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)

GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
abstract (1.0.0)
actionmailer (3.0.9)
actionpack (= 3.0.9)
mail (~> 2.2.19)
actionpack (3.0.9)
activemodel (= 3.0.9)
activesupport (= 3.0.9)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.5.0)
rack (~> 1.2.1)
rack-mount (~> 0.6.14)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
activemodel (3.0.9)
activesupport (= 3.0.9)
builder (~> 2.1.2)
i18n (~> 0.5.0)
activerecord (3.0.9)
activemodel (= 3.0.9)
activesupport (= 3.0.9)
arel (~> 2.0.10)
tzinfo (~> 0.3.23)
activerecord-jdbc-adapter (1.2.0) activerecord-jdbc-adapter (1.2.0)
activeresource (3.0.9) arel (3.0.0.rc1)
activemodel (= 3.0.9)
activesupport (= 3.0.9)
activesupport (3.0.9)
arel (2.0.10)
bouncy-castle-java (1.5.0146.1) bouncy-castle-java (1.5.0146.1)
builder (2.1.2) builder (3.0.0)
erubis (2.6.6) erubis (2.7.0)
abstract (>= 1.0.0) hike (1.2.1)
i18n (0.5.0) i18n (0.6.0)
jdbc-mysql (5.1.13) jdbc-mysql (5.1.13)
jdbc-postgres (9.0.801) jdbc-postgres (9.0.801)
jdbc-sqlite3 (3.7.2) jdbc-sqlite3 (3.7.2)
journey (1.0.0.rc2)
jquery-rails (1.0.14) jquery-rails (1.0.14)
railties (~> 3.0) railties (~> 3.0)
thor (~> 0.14) thor (~> 0.14)
jruby-openssl (0.7.4) jruby-openssl (0.7.4)
bouncy-castle-java bouncy-castle-java
jruby-rack (1.0.10) jruby-rack (1.0.10)
json (1.6.3)
json (1.6.3-java)
kgio (2.6.0) kgio (2.6.0)
mail (2.2.19) mail (2.3.0)
activesupport (>= 2.3.6)
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
treetop (~> 1.4.8) treetop (~> 1.4.8)
Expand All @@ -63,36 +86,29 @@ GEM
rack (>= 1.0.0) rack (>= 1.0.0)
rack-test (0.5.7) rack-test (0.5.7)
rack (>= 1.0) rack (>= 1.0)
rails (3.0.9) rails_autolink (1.0.4)
actionmailer (= 3.0.9) rails (>= 3.1.0)
actionpack (= 3.0.9)
activerecord (= 3.0.9)
activeresource (= 3.0.9)
activesupport (= 3.0.9)
bundler (~> 1.0)
railties (= 3.0.9)
railties (3.0.9)
actionpack (= 3.0.9)
activesupport (= 3.0.9)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.4)
raindrops (0.7.0) raindrops (0.7.0)
rake (0.9.2) rake (0.9.2.2)
rdoc (3.9.4) rdoc (3.12)
json (~> 1.4)
simple_form (1.5.1) simple_form (1.5.1)
actionpack (~> 3.0) actionpack (~> 3.0)
activemodel (~> 3.0) activemodel (~> 3.0)
sqlite3 (1.3.4) sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
thor (0.14.6) thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10) treetop (1.4.10)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
trinidad (1.2.3) trinidad (1.2.3)
jruby-rack (>= 1.0.9) jruby-rack (>= 1.0.9)
trinidad_jars (>= 1.0.1) trinidad_jars (>= 1.0.1)
trinidad_jars (1.0.1) trinidad_jars (1.0.1)
tzinfo (0.3.29) tzinfo (0.3.31)
unicorn (4.1.1) unicorn (4.1.1)
kgio (~> 2.4) kgio (~> 2.4)
rack rack
Expand Down
2 changes: 1 addition & 1 deletion config/database.yml
@@ -1,6 +1,6 @@
# SQLite version 3.x # SQLite version 3.x
# gem install sqlite3 # gem install sqlite3
development: test:
adapter: sqlite3 adapter: sqlite3
database: db/development.sqlite3 database: db/development.sqlite3
pool: 5 pool: 5
Expand Down
2 changes: 1 addition & 1 deletion config/environments/development.rb
Expand Up @@ -11,7 +11,7 @@


# Show full error reports and disable caching # Show full error reports and disable caching
config.consider_all_requests_local = true config.consider_all_requests_local = true
config.action_view.debug_rjs = true #config.action_view.debug_rjs = true
config.action_controller.perform_caching = false config.action_controller.perform_caching = false


# Don't care if the mailer can't send # Don't care if the mailer can't send
Expand Down
9 changes: 5 additions & 4 deletions db/schema.rb
@@ -1,3 +1,4 @@
# encoding: UTF-8
# This file is auto-generated from the current state of the database. Instead # This file is auto-generated from the current state of the database. Instead
# of editing this file, please use the migrations feature of Active Record to # of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition. # incrementally modify your database, and then regenerate this schema definition.
Expand All @@ -14,15 +15,15 @@


create_table "lists", :force => true do |t| create_table "lists", :force => true do |t|
t.string "name" t.string "name"
t.datetime "created_at" t.datetime "created_at", :null => false
t.datetime "updated_at" t.datetime "updated_at", :null => false
end end


create_table "tasks", :force => true do |t| create_table "tasks", :force => true do |t|
t.string "name" t.string "name"
t.boolean "done" t.boolean "done"
t.datetime "created_at" t.datetime "created_at", :null => false
t.datetime "updated_at" t.datetime "updated_at", :null => false
t.integer "list_id" t.integer "list_id"
end end


Expand Down

0 comments on commit 89b69b9

Please sign in to comment.