aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Ensure #second acts like #first AR finderJason Meller2014-01-2010-34/+245
* Merge branch 'anilmaurya-master'Rafael Mendonça França2014-01-201-3/+1
|\
| * moving controller_name assignment before model name conditionanilmaurya2014-01-201-3/+1
|/
* Tidy up tests and CHANGELOG for #12598Andrew White2014-01-204-7/+37
* Automatically convert dashes to underscores in shorthand routesMikko Johansson2014-01-202-0/+11
* Automatically convert dashes to underscores for url helpersAmr Tamimi2014-01-204-2/+20
* docs should say `email` not `Email`. [ci skip]Yves Senn2014-01-203-4/+4
* docs, hyperlink the `Mail gem` in Action Mailer guide. [ci skip]Yves Senn2014-01-201-2/+2
* let's link to the gem README not to the upgrading guide. [ci skip]Yves Senn2014-01-201-2/+1
* Fix secrets.yml path in exception messageCarlos Antonio da Silva2014-01-201-9/+7
* Merge pull request #13767 from zzak/doc_4_1_release_notes_deprecated_findersGodfrey Chan2014-01-201-0/+3
|\
| * Add link to upgrade guide for full list of deprecated finders [ci skip]Zachary Scott2014-01-191-0/+3
* | Merge pull request #13769 from arelenglish/fix_typo_upgrad_guideGodfrey Chan2014-01-191-1/+1
|\ \
| * | 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