aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Extracted blank matcher regexp to constantPaul Nikitochkin2013-12-281-1/+3
* Merge pull request #13514 from kuldeepaggarwal/f-removed-warningsYves Senn2013-12-281-1/+1
|\
| * setting `changed_attributes` instance variable if it is already initialized.Kuldeep Aggarwal2013-12-281-1/+1
|/
* Merge pull request #13513 from ilja/masterArun Agrawal2013-12-281-3/+4
|\
| * Typo fix [ci skip]Ilja Krijger2013-12-281-3/+4
|/
* Merge branch 'master' of github.com:rails/railsGuillermo Iguaran2013-12-272-0/+15
|\
| * Merge pull request #13474 from jdelStrother/becomesYves Senn2013-12-272-0/+15
| |\
| | * Copy changed_attributes across to newly become'd recordsJonathan del Strother2013-12-272-0/+15
* | | Update to Unicode 6.3.0Norman Clarke2013-12-272-1/+1
|/ /
* | Merge pull request #13505 from robin850/patch-13Yves Senn2013-12-272-1/+7
|\ \
| * | Ensure backward compatibility between Minitest 5 and 4Robin Dupret2013-12-272-1/+7
|/ /
* | Merge pull request #13483 from aditya-kapoor/add-missing-slashesYves Senn2013-12-276-6/+6
|\ \
| * | Adding missing backslashes in active_model files so as to avoid unwanted link...aditya-kapoor2013-12-276-6/+6
* | | doc fix. Use `sess.path` within `open_session`. Closes #13490. [ci skip]Yves Senn2013-12-271-1/+1
* | | Merge pull request #13500 from arunagw/remove-unused-requireYves Senn2013-12-262-2/+0
|\ \ \
| * | | rbconfig is not used in these filesArun Agrawal2013-12-262-2/+0
* | | | Merge pull request #13502 from arunagw/bug-report-template-warningGuillermo Iguaran2013-12-262-2/+2
|\ \ \ \
| * | | | Minitest::Unit::TestCase is Minitest::Test [ci skip]Arun Agrawal2013-12-262-2/+2
| |/ / /
* | | | Merge pull request #13495 from norman/tidy_bytesJeremy Kemper2013-12-261-35/+35
|\ \ \ \ | |/ / / |/| | |
| * | | Use String#scrub when available to tidy bytesNorman Clarke2013-12-261-35/+35
* | | | Merge pull request #13498 from dmitrydims/masterArun Agrawal2013-12-261-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed typo [CI skip]Semenyk Dmitriy2013-12-271-1/+1
|/ / /
* | | Merge pull request #13493 from Domon/improve-some-code-font-in-api-docXavier Noria2013-12-265-30/+31
|\ \ \
| * | | Improve font of some code in API documentation [ci skip]Chun-wei Kuo2013-12-265-30/+31
|/ / /
* | | Merge pull request #13442 from aditya-kapoor/update-docsGodfrey Chan2013-12-261-16/+11
|\ \ \
| * | | Added Backslashes to ActiveModel::AttributeMethods to prevent unwanted links ...aditya-kapoor2013-12-251-16/+11
* | | | Merge pull request #13485 from schneems/schneems/fix-more-railties-testsGuillermo Iguaran2013-12-252-3/+6
|\ \ \ \
| * | | | Fix failure introduced from #13488schneems2013-12-251-1/+1
| * | | | fix 2.1.0 bug :(schneems2013-12-251-1/+1
| * | | | ensure environment is run before db:structure:loadschneems2013-12-251-1/+1
| * | | | Partial fix of database url testsschneems2013-12-251-1/+4
|/ / / /
* | | | Fix tests names: tokens.yml => secrets.ymlGuillermo Iguaran2013-12-251-2/+2
* | | | Merge pull request #13488 from strzalek/fix-railties-warningsGuillermo Iguaran2013-12-252-1/+2
|\ \ \ \
| * | | | Cast env to symbol, fixes deprecation warningŁukasz Strzałkowski2013-12-251-1/+1
| * | | | Avoid getting redefined method warningŁukasz Strzałkowski2013-12-251-0/+1
|/ / / /
* | | | Merge pull request #13478 from schneems/schneems/fix-mysqlGuillermo Iguaran2013-12-252-7/+7
|\ \ \ \
| * | | | Move mysql2 test for when adapter will be loadedschneems2013-12-242-7/+7
* | | | | Test with 2.1.0Guillermo Iguaran2013-12-251-1/+1
| |_|/ / |/| | |
* | | | Merge pull request #13482 from aayushkhandelwal11/typoArun Agrawal2013-12-251-1/+1
|\ \ \ \
| * | | | Typo rectified commom => common[ci skip]Aayush khandelwal2013-12-251-1/+1
* | | | | Merge pull request #13480 from kuldeepaggarwal/f-removed-depricated-configJosé Valim2013-12-252-2/+2
|\ \ \ \ \
| * | | | | using symbol instead of string in establish_connectionKuldeep Aggarwal2013-12-252-2/+2
* | | | | | Unused classes in AP testsAkira Matsuda2013-12-252-14/+0
|/ / / / /
* | / / / Unused class in AV testAkira Matsuda2013-12-251-2/+0
| |/ / / |/| | |
* | | | Revert "Ensure secret_key_base is set for all environments"José Valim2013-12-241-2/+1
* | | | Merge pull request #13472 from schneems/schneems/fix-master-database-url-testsJosé Valim2013-12-241-1/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix railties tests in masterschneems2013-12-241-1/+2
* | | | Merge pull request #13471 from schneems/schneems/better-secrets-error-messageJosé Valim2013-12-241-1/+1
|\ \ \ \
| * | | | Better missing `secret_key_base` error messageschneems2013-12-241-1/+1
* | | | | Merge pull request #13469 from schneems/schneems/no-database-errors-allJosé Valim2013-12-246-2/+41
|\ \ \ \ \ | |_|/ / / |/| | | |