aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix a typo that says you application [ci skip]Arel English2014-01-201-1/+1
* Merge pull request #13768 from rajeshthummalapally/rails_blog_correct_patch_linkGodfrey Chan2014-01-191-1/+1
|\
| * Correcting link that is pointing to Rails blog [ci skip]Rajesh Thummalapally2014-01-191-1/+1
|/
* Merge pull request #13765 from robertomiranda/secrets_tokenGuillermo Iguaran2014-01-191-4/+4
|\
| * Update Error Message when secrets.secret_key_base isn't givenrobertomiranda2014-01-191-4/+4
* | Merge pull request #13745 from nextgearcapital/masterRafael Mendonça França2014-01-193-0/+6
|\ \
| * | set encoding to binmode for pipeAnna Carey2014-01-173-0/+6
* | | Merge pull request #13762 from robertomiranda/spring-under-railsRobin Dupret2014-01-191-1/+1
|\ \ \ | |_|/ |/| |
| * | Update Changelog, Spring is under rails/spring [ci skip]robertomiranda2014-01-191-1/+1
|/ /
* | Merge pull request #13759 from raysrashmi/rails-springRobin Dupret2014-01-193-4/+4
|\ \
| * | Spring in now under rails/spring [ci skip]Rashmi Yadav2014-01-193-4/+4
|/ /
* | Merge pull request #13756 from huoxito/rails-springAndrew White2014-01-191-1/+1
|\ \
| * | spring gem moved to rails/springWashington Luiz2014-01-181-1/+1
|/ /
* | Merge pull request #13751 from chancancode/ar_rollback_fixGodfrey Chan2014-01-184-6/+26
|\ \
| * | Restore ActiveRecord states after a rollback for models w/o callbacksGodfrey Chan2014-01-184-6/+26
|/ /
* | Merge pull request #13748 from summerblue/masterRichard Schneeman2014-01-171-1/+1
|\ \
| * | Correct the version number to 4 in guides[ci skip]Charlie Jade2014-01-181-1/+1
|/ /
* | fix exception translationAaron Patterson2014-01-172-3/+4
* | translate exceptions on prepared statement failureAaron Patterson2014-01-172-6/+13
* | test to ensure bad prepared statements raise a StatementInvalid exceptionAaron Patterson2014-01-171-0/+6
|/
* Fix eager load of Serializers on Active ModelCarlos Antonio da Silva2014-01-171-2/+2
* Consistence in the block styleRafael Mendonça França2014-01-172-5/+5
* Remove warnings on Ruby 2.1Rafael Mendonça França2014-01-172-1/+9
* Only some dynamic finders are deprecated.Rafael Mendonça França2014-01-161-5/+5
* Merge pull request #13735 from xta/cleanup_security_guideLauro Caetano2014-01-161-1/+1
|\
| * clean up security guide: his => their [ci skip]Rex Feng2014-01-161-1/+1
|/
* Remove warningRafael Mendonça França2014-01-161-2/+2
* Merge pull request #13414 from britto/jb-fix-dependency-matchingRafael Mendonça França2014-01-163-29/+184
|\
| * Update changelogJoão Britto2014-01-091-0/+7
| * Avoid scanning multiple render calls as a single match.João Britto2014-01-092-21/+45
| * Improve ERB dependency detection.João Britto2014-01-092-21/+145
* | Extract a method to simplify setup codeCarlos Antonio da Silva2014-01-161-23/+27
* | Use minitest's skip rather than conditionals + early returnsCarlos Antonio da Silva2014-01-161-47/+38
* | Move AR test classes inside the test caseCarlos Antonio da Silva2014-01-161-38/+46
* | Do not set up a variable used only in two testsCarlos Antonio da Silva2014-01-161-15/+18
* | No need for instance vars on single testsCarlos Antonio da Silva2014-01-161-8/+8
* | Cleanup duplicated setup of callbacks in transactions testsCarlos Antonio da Silva2014-01-161-48/+19
* | No need to use #send with public methodsCarlos Antonio da Silva2014-01-161-10/+10
* | Merge pull request #13734 from tjschuck/fixture_class_name_deprecation_warningCarlos Antonio da Silva2014-01-161-2/+2
|\ \
| * | Update deprecation warning to give more information about callerT.J. Schuck2014-01-161-2/+2
* | | define the delegate methods on one line. fixes #13724Aaron Patterson2014-01-162-20/+32
|/ /
* | Merge branch 'ca-touch-commit-callbacks'Carlos Antonio da Silva2014-01-166-11/+80
|\ \
| * | Make AR::Base#touch fire the after_commit and after_rollback callbacksHarry Brundage2014-01-165-2/+71
| * | Fix test for cache_key + touchedCarlos Antonio da Silva2014-01-161-9/+9
|/ /
* | Revert "methods are defined right after the module_eval, so we don't need to do"Piotr Sarnacki2014-01-161-2/+2
* | Revert "Don't remove trailing slash from PATH_INFO for mounted apps"Piotr Sarnacki2014-01-163-18/+1
* | Add failing test for #13369Piotr Sarnacki2014-01-161-0/+18
* | Merge branch 'fix_order_dependent_tests_in_active_record_suite'Yves Senn2014-01-168-43/+45
|\ \
| * | reset column information after fiddling with `Encoding.default_internal`Yves Senn2014-01-161-0/+1
| * | we have `with_env_tz` as global test helper. Remove duplicate.Yves Senn2014-01-162-14/+0