Merge branch 'master' into serializers

Author: josevalim

.gitignore

@@ -1,26 +1,24 @@
-pkg
-.bundle
-Gemfile.lock
+# Don't put *.swp, *.bak, etc here; those belong in a global ~/.gitignore.
+# Check out http://help.github.com/ignore-files/ for how to set that up.
+
 debug.log
-doc/rdoc
-activemodel/doc
-activeresource/doc
-activerecord/doc
-activerecord/sqlnet.log
-actionpack/doc
-actionmailer/doc
-activesupport/doc
-activesupport/test/tmp
-activemodel/test/fixtures/fixture_database.sqlite3
-actionpack/test/tmp
-activesupport/test/fixtures/isolation_test
-dist
-railties/test/500.html
-railties/test/fixtures/tmp
-railties/test/initializer/root/log
-railties/doc
-railties/guides/output
-railties/tmp
-.rvmrc
-.rbenv-version
-RDOC_MAIN.rdoc
+.Gemfile
+/.bundle
+/.rbenv-version
+/.rvmrc
+/Gemfile.lock
+/pkg
+/dist
+/doc/rdoc
+/*/doc
+/*/test/tmp
+/activerecord/sqlnet.log
+/activemodel/test/fixtures/fixture_database.sqlite3
+/activesupport/test/fixtures/isolation_test
+/railties/test/500.html
+/railties/test/fixtures/tmp
+/railties/test/initializer/root/log
+/railties/doc
+/railties/guides/output
+/railties/tmp
+/RDOC_MAIN.rdoc

.travis.yml

@@ -2,7 +2,7 @@ script: 'ci/travis.rb'
 rvm:
   - 1.8.7
   - 1.9.2
-  #- 1.9.3 # Disable 1.9.3 builds until Travis is on 1.9.3-rc1.
+  - 1.9.3
 env:
   - "GEM=railties"
   - "GEM=ap,am,amo,ares,as"

Gemfile

@@ -4,6 +4,8 @@ gemspec
 
 if ENV['AREL']
   gem "arel", :path => ENV['AREL']
+else
+  gem "arel", :git => "git://github.com/rails/arel"
 end
 
 gem "bcrypt-ruby", "~> 3.0.0"
@@ -19,12 +21,7 @@ end
 # it being automatically loaded by sprockets
 gem "uglifier", ">= 1.0.3", :require => false
 
-# Temp fix until rake 0.9.3 is out
-if RUBY_VERSION >= "1.9.3"
-  gem "rake", "0.9.3.beta.1"
-else
-  gem "rake", ">= 0.8.7"
-end
+gem "rake", ">= 0.8.7"
 gem "mocha", ">= 0.9.8"
 
 group :doc do
@@ -39,14 +36,11 @@ gem "memcache-client", ">= 1.8.5"
 
 platforms :mri_18 do
   gem "system_timer"
-  gem "ruby-debug", ">= 0.10.3" unless ENV['TRAVIS']
   gem "json"
 end
 
-platforms :mri_19 do
-  # TODO: Remove the conditional when ruby-debug19 supports Ruby >= 1.9.3
-  gem "ruby-debug19", :require => "ruby-debug" unless RUBY_VERSION > "1.9.2" || ENV['TRAVIS']
-end
+# Add your own local bundler stuff
+instance_eval File.read ".Gemfile" if File.exists? ".Gemfile"
 
 platforms :mri do
   group :test do
@@ -73,7 +67,6 @@ platforms :ruby do
 end
 
 platforms :jruby do
-  gem "ruby-debug", ">= 0.10.3"
   gem "json"
   gem "activerecord-jdbcsqlite3-adapter", ">= 1.2.0"
 

RELEASING_RAILS.rdoc

@@ -25,6 +25,12 @@ for Rails.  You can check the status of his tests here:
 
 Do not release with Red AWDwR tests.
 
+=== Are the postgres tests green? If not, make them green
+
+Currently Travis CI doesn't run the Active Record postgres tests. They are
+working to resolve this, but in the mean time, it is crucial to ensure that
+the tests are still green before release.
+
 === Do we have any git dependencies?  If so, contact those authors.
 
 Having git dependencies indicates that we depend on unreleased code.
@@ -60,6 +66,8 @@ for today:
 
 === Is Sam Ruby happy?  If not, make him happy.
 
+=== Are the postgres tests green? If not, make them green
+
 === Contact the security team.  CVE emails must be sent on this day.
 
 === Create a release branch.
@@ -81,8 +89,20 @@ You can review the commits for the 3.0.10 release like this:
 
     [aaron@higgins rails (3-0-10)]$ git log v3.0.9..
 
+If you're doing a stable branch release, you should also ensure that all of
+the CHANGELOG entries in the stable branch are also synced to the master
+branch.
+
 === Update the RAILS_VERSION file to include the RC.
 
+=== Build and test the gem.
+
+Run `rake install` to generate the gems and install them locally. Then try
+generating a new app and ensure that nothing explodes.
+
+This will stop you looking silly when you push an RC to rubygems.org and then
+realise it is broken.
+
 === Release the gem.
 
 IMPORTANT: Due to YAML parse problems on the rubygems.org server, it is safest
@@ -150,6 +170,7 @@ Today, do this stuff in this order:
 * Apply security patches to the release branch
 * Update CHANGELOG with security fixes.
 * Update RAILS_VERSION to remove the rc
+* Build and test the gem
 * Release the gems
 * Email security lists
 * Email general announcement lists
@@ -184,3 +205,34 @@ There are two simple steps for fixing the CI:
 2. Fix it
 
 Repeat these steps until the CI is green.
+
+=== Manually trigger docs generation
+
+We have a post-receive hook in GitHub that calls the docs server on pushes.
+Triggers generation and publication of edge docs, updates the contrib app,
+and generates and publishes stable docs if a new stable tag is detected.
+
+The hook unfortunately is not invoked by tag pushing, so once the new stable
+tag has been pushed to origin, please run
+
+    curl -X POST -d '' http://rails-hooks.hashref.com/rails-master-hook
+
+You should see something like this:
+
+    Rails master hook tasks scheduled:
+
+      * updates the local checkout
+      * updates Rails Contributors
+      * generates and publishes edge docs
+
+    If a new stable tag is detected it also
+
+      * generates and publishes stable docs
+
+    This needs typically a few minutes.
+
+Note you do not need to specify the tag, the docs server figures it out.
+
+Also, don't worry if you call that multiple times or the hook is triggered
+again by some immediate regular push, if the scripts are running new calls
+are just queued (in a queue of size 1).

Rakefile

@@ -97,43 +97,43 @@ RDoc::Task.new do |rdoc|
   rdoc.options << '-g' # SDoc flag, link methods to GitHub
   rdoc.options << '-m' << RDOC_MAIN
 
-  rdoc.rdoc_files.include('railties/CHANGELOG')
+  rdoc.rdoc_files.include('railties/CHANGELOG.md')
   rdoc.rdoc_files.include('railties/MIT-LICENSE')
   rdoc.rdoc_files.include('railties/README.rdoc')
   rdoc.rdoc_files.include('railties/lib/**/*.rb')
   rdoc.rdoc_files.exclude('railties/lib/rails/generators/**/templates/**/*.rb')
 
   rdoc.rdoc_files.include('activerecord/README.rdoc')
-  rdoc.rdoc_files.include('activerecord/CHANGELOG')
+  rdoc.rdoc_files.include('activerecord/CHANGELOG.md')
   rdoc.rdoc_files.include('activerecord/lib/active_record/**/*.rb')
   rdoc.rdoc_files.exclude('activerecord/lib/active_record/vendor/*')
 
   rdoc.rdoc_files.include('activeresource/README.rdoc')
-  rdoc.rdoc_files.include('activeresource/CHANGELOG')
+  rdoc.rdoc_files.include('activeresource/CHANGELOG.md')
   rdoc.rdoc_files.include('activeresource/lib/active_resource.rb')
   rdoc.rdoc_files.include('activeresource/lib/active_resource/*')
 
   rdoc.rdoc_files.include('actionpack/README.rdoc')
-  rdoc.rdoc_files.include('actionpack/CHANGELOG')
+  rdoc.rdoc_files.include('actionpack/CHANGELOG.md')
   rdoc.rdoc_files.include('actionpack/lib/abstract_controller/**/*.rb')
   rdoc.rdoc_files.include('actionpack/lib/action_controller/**/*.rb')
   rdoc.rdoc_files.include('actionpack/lib/action_dispatch/**/*.rb')
   rdoc.rdoc_files.include('actionpack/lib/action_view/**/*.rb')
   rdoc.rdoc_files.exclude('actionpack/lib/action_controller/vendor/*')
 
   rdoc.rdoc_files.include('actionmailer/README.rdoc')
-  rdoc.rdoc_files.include('actionmailer/CHANGELOG')
+  rdoc.rdoc_files.include('actionmailer/CHANGELOG.md')
   rdoc.rdoc_files.include('actionmailer/lib/action_mailer/base.rb')
   rdoc.rdoc_files.include('actionmailer/lib/action_mailer/mail_helper.rb')
   rdoc.rdoc_files.exclude('actionmailer/lib/action_mailer/vendor/*')
 
   rdoc.rdoc_files.include('activesupport/README.rdoc')
-  rdoc.rdoc_files.include('activesupport/CHANGELOG')
+  rdoc.rdoc_files.include('activesupport/CHANGELOG.md')
   rdoc.rdoc_files.include('activesupport/lib/active_support/**/*.rb')
   rdoc.rdoc_files.exclude('activesupport/lib/active_support/vendor/*')
 
   rdoc.rdoc_files.include('activemodel/README.rdoc')
-  rdoc.rdoc_files.include('activemodel/CHANGELOG')
+  rdoc.rdoc_files.include('activemodel/CHANGELOG.md')
   rdoc.rdoc_files.include('activemodel/lib/active_model/**/*.rb')
 end