Skip to content

Commit

Permalink
update rails to 3.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
xn committed Nov 21, 2011
1 parent 8232565 commit cf1d907
Show file tree
Hide file tree
Showing 2 changed files with 115 additions and 115 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Original file line Diff line number Diff line change
@@ -1,14 +1,14 @@
source 'http://rubygems.org' source 'http://rubygems.org'


gem 'rails', '3.1.0.rc4' gem 'rails', '3.1.3'


# Assets and forms # Assets and forms
gem 'paperclip' gem 'paperclip'
gem 'formtastic', :git => 'git://github.com/justinfrench/formtastic.git' gem 'formtastic', :git => 'git://github.com/justinfrench/formtastic.git'


# Asset template engines # Asset template engines
gem 'json' gem 'json'
gem 'sass-rails', "~> 3.1.0.rc" gem 'sass-rails'
gem 'coffee-script' gem 'coffee-script'


group :development, :test do group :development, :test do
Expand Down
226 changes: 113 additions & 113 deletions Gemfile.lock
Original file line number Original file line Diff line number Diff line change
@@ -1,154 +1,152 @@
GIT GIT
remote: git://github.com/jnicklas/evergreen.git remote: git://github.com/jnicklas/evergreen.git
revision: 0402087fd081a3244ea0d2ca69a58966accb4797 revision: ba3bf9ced03abfeb20d6a00c67b424e575007791
submodules: true submodules: true
specs: specs:
evergreen (0.4.0) evergreen (1.0.0)
capybara (~> 0.4.0) capybara (~> 1.0)
coffee-script (~> 2.1) coffee-script
json_pure (>= 1.0.0) json_pure
launchy (>= 0.3.5) launchy
sinatra (>= 1.1) sinatra (~> 1.1)


GIT GIT
remote: git://github.com/justinfrench/formtastic.git remote: git://github.com/justinfrench/formtastic.git
revision: 2e8e282d8ff02ddf5bbf1ce8b4ec6ce373e4d9cb revision: 45ec7a7e5bfb760cc77be09c3f0aa508a3903026
specs: specs:
formtastic (2.0.0.rc2) formtastic (2.0.1)
rails (~> 3.0) actionpack (~> 3.0)


GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
actionmailer (3.1.0.rc4) actionmailer (3.1.3)
actionpack (= 3.1.0.rc4) actionpack (= 3.1.3)
mail (~> 2.3.0) mail (~> 2.3.0)
actionpack (3.1.0.rc4) actionpack (3.1.3)
activemodel (= 3.1.0.rc4) activemodel (= 3.1.3)
activesupport (= 3.1.0.rc4) activesupport (= 3.1.3)
builder (~> 3.0.0) builder (~> 3.0.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
i18n (~> 0.6) i18n (~> 0.6)
rack (~> 1.3.0) rack (~> 1.3.5)
rack-cache (~> 1.0.1) rack-cache (~> 1.1)
rack-mount (~> 0.8.1) rack-mount (~> 0.8.2)
rack-test (~> 0.6.0) rack-test (~> 0.6.1)
sprockets (~> 2.0.0.beta.10) sprockets (~> 2.0.3)
tzinfo (~> 0.3.27) activemodel (3.1.3)
activemodel (3.1.0.rc4) activesupport (= 3.1.3)
activesupport (= 3.1.0.rc4)
bcrypt-ruby (~> 2.1.4)
builder (~> 3.0.0) builder (~> 3.0.0)
i18n (~> 0.6) i18n (~> 0.6)
activerecord (3.1.0.rc4) activerecord (3.1.3)
activemodel (= 3.1.0.rc4) activemodel (= 3.1.3)
activesupport (= 3.1.0.rc4) activesupport (= 3.1.3)
arel (~> 2.1.1) arel (~> 2.2.1)
tzinfo (~> 0.3.27) tzinfo (~> 0.3.29)
activeresource (3.1.0.rc4) activeresource (3.1.3)
activemodel (= 3.1.0.rc4) activemodel (= 3.1.3)
activesupport (= 3.1.0.rc4) activesupport (= 3.1.3)
activesupport (3.1.0.rc4) activesupport (3.1.3)
multi_json (~> 1.0) multi_json (~> 1.0)
addressable (2.2.6)
archive-tar-minitar (0.5.2) archive-tar-minitar (0.5.2)
arel (2.1.1) arel (2.2.1)
bcrypt-ruby (2.1.4)
builder (3.0.0) builder (3.0.0)
capybara (0.4.1.2) capybara (1.1.2)
celerity (>= 0.7.9)
culerity (>= 0.2.4)
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
rack (>= 1.0.0) rack (>= 1.0.0)
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
selenium-webdriver (>= 0.0.27) selenium-webdriver (~> 2.0)
xpath (~> 0.1.3) xpath (~> 0.1.4)
capybara-firebug (0.0.5) capybara-firebug (0.0.10)
capybara (~> 0.4.1.2) capybara (~> 1.0)
celerity (0.8.9) childprocess (0.2.2)
childprocess (0.1.9)
ffi (~> 1.0.6) ffi (~> 1.0.6)
cocaine (0.2.0)
coffee-script (2.2.0) coffee-script (2.2.0)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.1.1) coffee-script-source (1.1.3)
columnize (0.3.3) columnize (0.3.4)
configuration (1.2.0) cucumber (1.1.2)
cucumber (0.10.7)
builder (>= 2.1.2) builder (>= 2.1.2)
diff-lcs (>= 1.1.2) diff-lcs (>= 1.1.2)
gherkin (~> 2.4.0) gherkin (~> 2.6.2)
json (>= 1.4.6) json (>= 1.4.6)
term-ansicolor (>= 1.0.5) term-ansicolor (>= 1.0.6)
cucumber-rails (0.4.1) cucumber-rails (1.2.0)
cucumber (>= 0.10.1) capybara (>= 1.1.1)
nokogiri (>= 1.4.4) cucumber (>= 1.1.1)
rack-test (>= 0.5.7) nokogiri (>= 1.5.0)
culerity (0.2.15) daemons (1.1.4)
daemons (1.1.3) database_cleaner (0.7.0)
database_cleaner (0.6.7) diff-lcs (1.1.3)
diff-lcs (1.1.2)
erubis (2.7.0) erubis (2.7.0)
eventmachine (0.12.10) eventmachine (0.12.10)
execjs (1.1.3) execjs (1.2.9)
multi_json (~> 1.0) multi_json (~> 1.0)
ffi (1.0.9) ffi (1.0.11)
gherkin (2.4.0) gherkin (2.6.6)
json (>= 1.4.6) json (>= 1.4.6)
git (1.2.5) git (1.2.5)
hike (1.1.0) hike (1.2.1)
i18n (0.6.0) i18n (0.6.0)
jeweler (1.6.2) jeweler (1.6.4)
bundler (~> 1.0) bundler (~> 1.0)
git (>= 1.2.5) git (>= 1.2.5)
rake rake
jquery-rails (1.0.11) jquery-rails (1.0.18)
railties (~> 3.0) railties (~> 3.0)
thor (~> 0.14) thor (~> 0.14)
json (1.5.2) json (1.6.1)
json_pure (1.5.2) json_pure (1.6.1)
launchy (0.4.0) launchy (2.0.5)
configuration (>= 0.0.5) addressable (~> 2.2.6)
rake (>= 0.8.1)
linecache19 (0.5.12) linecache19 (0.5.12)
ruby_core_source (>= 0.1.4) ruby_core_source (>= 0.1.4)
mail (2.3.0) mail (2.3.0)
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
treetop (~> 1.4.8) treetop (~> 1.4.8)
mime-types (1.16) mime-types (1.17.2)
multi_json (1.0.3) multi_json (1.0.3)
nokogiri (1.4.5) nokogiri (1.5.0)
paperclip (2.3.11) paperclip (2.4.5)
activerecord (>= 2.3.0) activerecord (>= 2.3.0)
activesupport (>= 2.3.2) activesupport (>= 2.3.2)
polyglot (0.3.1) cocaine (>= 0.0.2)
rack (1.3.0) mime-types
rack-cache (1.0.2) polyglot (0.3.3)
rack (1.3.5)
rack-cache (1.1)
rack (>= 0.4) rack (>= 0.4)
rack-mount (0.8.1) rack-mount (0.8.3)
rack (>= 1.0.0) rack (>= 1.0.0)
rack-protection (1.1.4)
rack
rack-ssl (1.3.2) rack-ssl (1.3.2)
rack rack
rack-test (0.6.0) rack-test (0.6.1)
rack (>= 1.0) rack (>= 1.0)
rails (3.1.0.rc4) rails (3.1.3)
actionmailer (= 3.1.0.rc4) actionmailer (= 3.1.3)
actionpack (= 3.1.0.rc4) actionpack (= 3.1.3)
activerecord (= 3.1.0.rc4) activerecord (= 3.1.3)
activeresource (= 3.1.0.rc4) activeresource (= 3.1.3)
activesupport (= 3.1.0.rc4) activesupport (= 3.1.3)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.1.0.rc4) railties (= 3.1.3)
railties (3.1.0.rc4) railties (3.1.3)
actionpack (= 3.1.0.rc4) actionpack (= 3.1.3)
activesupport (= 3.1.0.rc4) activesupport (= 3.1.3)
rack-ssl (~> 1.3.2) rack-ssl (~> 1.3.2)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
thor (~> 0.14.6) thor (~> 0.14.6)
rake (0.9.2) rake (0.9.2.2)
rdoc (3.6.1) rdoc (3.11)
json (~> 1.4)
ruby-debug-base19 (0.11.25) ruby-debug-base19 (0.11.25)
columnize (>= 0.3.1) columnize (>= 0.3.1)
linecache19 (>= 0.5.11) linecache19 (>= 0.5.11)
Expand All @@ -160,36 +158,38 @@ GEM
ruby_core_source (0.1.5) ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2) archive-tar-minitar (>= 0.5.2)
rubyzip (0.9.4) rubyzip (0.9.4)
sass (3.1.2) sass (3.1.10)
sass-rails (3.1.0.rc.2) sass-rails (3.1.5)
actionpack (~> 3.1.0.rc1) actionpack (~> 3.1.0)
railties (~> 3.1.0.rc1) railties (~> 3.1.0)
sass (>= 3.1.2) sass (~> 3.1.10)
sprockets (>= 2.0.0.beta.9) tilt (~> 1.3.2)
selenium-webdriver (0.2.1) selenium-webdriver (2.13.0)
childprocess (>= 0.1.7) childprocess (>= 0.2.1)
ffi (>= 1.0.7) ffi (~> 1.0.9)
json_pure json_pure
rubyzip rubyzip
sinatra (1.2.6) sinatra (1.3.1)
rack (~> 1.1) rack (~> 1.3, >= 1.3.4)
tilt (< 2.0, >= 1.2.2) rack-protection (~> 1.1, >= 1.1.2)
sprockets (2.0.0.beta.10) tilt (~> 1.3, >= 1.3.3)
hike (~> 1.0) sprockets (2.0.3)
hike (~> 1.2)
rack (~> 1.0) rack (~> 1.0)
tilt (!= 1.3.0, ~> 1.1) tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.3) sqlite3 (1.3.4)
term-ansicolor (1.0.5) term-ansicolor (1.0.7)
thin (1.2.11) thin (1.3.1)
daemons (>= 1.0.9) daemons (>= 1.0.9)
eventmachine (>= 0.12.6) eventmachine (>= 0.12.6)
rack (>= 1.0.0) rack (>= 1.0.0)
thor (0.14.6) thor (0.14.6)
tilt (1.3.2) tilt (1.3.3)
treetop (1.4.9) treetop (1.4.10)
polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
tzinfo (0.3.28) tzinfo (0.3.31)
uglifier (0.5.4) uglifier (1.1.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
multi_json (>= 1.0.2) multi_json (>= 1.0.2)
xpath (0.1.4) xpath (0.1.4)
Expand All @@ -210,9 +210,9 @@ DEPENDENCIES
jquery-rails jquery-rails
json json
paperclip paperclip
rails (= 3.1.0.rc4) rails (= 3.1.3)
ruby-debug19 ruby-debug19
sass-rails (~> 3.1.0.rc) sass-rails
sqlite3 sqlite3
thin thin
uglifier uglifier

0 comments on commit cf1d907

Please sign in to comment.