Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rails/rails
...
head fork: rails/rails
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Nov 19, 2011
@jonleighton jonleighton Don't html-escape the :count option to translate if it's a Numeric. F…
…ixes #3685.

Conflicts:

	actionpack/CHANGELOG.md

Conflicts:

	actionpack/CHANGELOG.md
13ad879
Commits on Nov 30, 2011
@arunagw arunagw ActiveModel confirmation validator fix fixes #1152
If you have an ActiveModel class that has a 
method email_address_confirmation. 
This method is being overwritten by the 
method defined in the Confirmation validator.
be8485e
@josevalim josevalim Merge pull request #3805 from arunagw/active_model_patch_3-0-stable
Active model patch 3 0 stable
9ebacf3
Commits on Dec 03, 2011
@sumbach sumbach Test return value of ActiveSupport::Dependencies::Loadable#require
- Add tests to protect from regressions in require's return value behavior
- See a10606c (require needs to return true or false) for the original bug fix
dea2e9c
@sumbach sumbach Test return value of ActiveSupport::Dependencies::Loadable#load 9effced
@sumbach sumbach Test that require and load raise LoadError if file not found 0531e26
@sumbach sumbach Simplify load and require tests
- These tests don't use autoloading so there's no need to add anything to autoload_paths
289ae94
@tenderlove tenderlove require needs to return true or false. thank you Ryan "zenspider" Davis 8fabf78
@tenderlove tenderlove `load` should also return the value from `super` cc3fb2e
@tenderlove tenderlove Merge pull request #3846 from sumbach/backport-load-and-require-fixes…
…-to-3-0

Backport load and require fixes to 3 0
36b6c52
@jonleighton jonleighton Enable postgres on the CI :heart: :beer: :sparkles:
Conflicts:

	Gemfile
51dcf85
Commits on Dec 17, 2011
@spastorino spastorino Sync .travis.yml with master 10c8e8d
@josevalim josevalim Update .travis.yml ad9a0e3
Commits on Dec 18, 2011
@jonleighton jonleighton Prefix newly added method to avoid breakings people's apps.
See
378ce0e

Fixes #3921.
b7e45c3
Commits on Dec 19, 2011
@jonleighton jonleighton Don't notify campfire when the build keeps passing ab05e2b
Commits on Dec 20, 2011
@spastorino spastorino Merge pull request #4031 from arunagw/3-0-stable
3 0 stable travis sync
ce650ee
Commits on Dec 31, 2011
@amatsuda amatsuda bump up rack version to the one that includes the Hash DoS fix 7e03b9d
@josevalim josevalim Merge pull request #4246 from amatsuda/hashdos_30
bump up rack version to the one that includes the Hash DoS fix
a048568
Commits on Jan 07, 2012
@arunagw arunagw Fixed failing test for ruby-1.8.7-p357
See #4292
91a9b24
@josevalim josevalim Merge pull request #4372 from arunagw/fixed_failing_test
Fixed failing test
d4c26c4
Commits on Jan 24, 2012
@tenderlove tenderlove Merge pull request #4514 from brainopia/update_timezone_offets
Update time zone offset information
c67ff97
Commits on Feb 20, 2012
@lest lest fix output safety issue with select options 5b4082f
Commits on Feb 21, 2012
@amatsuda amatsuda add AS::SafeBuffer#clone_empty e50ee96
@amatsuda amatsuda use AS::SafeBuffer#clone_empty for flushing the output_buffer 6adc417
Commits on Feb 22, 2012
@jonleighton jonleighton Merge commit 'v3.0.11' into 3-0-stable 67b6847
@tenderlove tenderlove updating RAILS_VERSION 2935435
Commits on Mar 01, 2012
@josevalim josevalim Ensure [] respects the status of the buffer. 917fd1a
@tenderlove tenderlove Merge branch '3-0-stable-security' into 3-0-12
* 3-0-stable-security:
  Ensure [] respects the status of the buffer.
  use AS::SafeBuffer#clone_empty for flushing the output_buffer
  add AS::SafeBuffer#clone_empty
  fix output safety issue with select options
9435f5a
@tenderlove tenderlove bumping to 3.0.12 9d6377e
Something went wrong with that request. Please try again.