Remove deprecated attr_accessible mention
Merge pull request #10098 from subwindow/postgres_dump_bigint_default

Correctly parse bigint defaults in PostgreSQL

Conflicts:
	activerecord/CHANGELOG.md
Fix explicit names on multiple file fields

If a file field tag is passed the multiple option, it is turned into an
array field (appending "[]"), but if the file field is passed an
explicit name as an option, leave the name alone (do not append "[]").

Fixes #9830
Merge pull request #10106 from rmm5t/fix-explicit-name-on-multiple-fields-master

Fix explicit names on multiple file fields
Improve the changelog entry [ci skip]
Removed unnecessary class
just check pending migrations in the current environment
Merge pull request #9555 from tmm1/optimize-erb

Optimize generated ERB to reduce method calls
Merge pull request #10108 from choudhuryanupam/master

Removed unnecessary class
Removed space and unused class
Merge pull request #10110 from choudhuryanupam/master

Removed space and unused class
do not blow away the test database on every run
Merge branch 'master' into railstest

* master: (44 commits)
  Improve the changelog entry [ci skip]
  Fix explicit names on multiple file fields
  Correctly parse bigint defaults in PostgreSQL
  Move changelog to the top [ci skip]
  Fix indent and remove extra white spaces
  Fix scope chaining + STI
  failing test for #9869
  Improve `belongs_to touch: true` timestamp test
  Sort modules in alphabetical order.
  Avoid an attempt to fetch old record when id was not present in touch callback
  Use the correct pk field from the reflected class to find the old record
  Refactor mail_to to not generate intermediate hashes when adding href
  Ensure mail_to helper does not modify the given html options hash
  Use inspect when writing the foreign key from the reflection
  Use a space after the comment sign when showing the result of commands
  Exclude template files for rdoc API [ci skip]
  template should have generic name
  use | to have more intent revealing code
  Revert "Merge pull request #10034 from benofsky/fix_skipping_object_callback_filters"
  stop depending on callbacks
  ...

Conflicts:
	railties/test/application/rake_test.rb
Merge branch 'railstest'

* railstest:
  do not blow away the test database on every run
  just check pending migrations in the current environment
  check pending migrations against the test db
  only match the default task
  test no longer makes sense after requiring all test files
  switch the testing tests to use rake
  a test file can be provided to rake, e.g.:
  switch to Rails::TestTask
  default task should also be in the test env
  ensure the schema checking is done in the dev connection
  Revert "Update Rake tasks to call `rails test` instead"
  Revert "Warning removed unused variable task_name"
  apps that depend on active record should load fixtures
Remove extra whitespace
Update Rake tasks to call `rails test` instead

Also, print out deprecation warning for other rake tasks except
`rake test` and `rake` (default)

Conflicts:
	railties/lib/rails/test_unit/testing.rake
	railties/test/application/rake_test.rb
Merge pull request #10111 from Agis-/patch-1

Remove extra whitespace
removing `rails test`, updating docs to show how to use `rake test`
just use ruby to run tests
add a class for splitting up rake commands