aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ci skip] Mention `parsed_body` in docs.Kasper Timm Hansen2016-02-111-2/+1
* [ci skip] Fix syntax error in CHANGELOG example.Kasper Timm Hansen2016-02-111-1/+1
* Make `parsed_body` extract parser from the content type.Kasper Timm Hansen2016-02-114-6/+20
* Don't capture the MissingTemplate exception.Kasper Timm Hansen2016-02-111-1/+1
* Oops. :cut:Aaron Patterson2016-02-111-6/+0
* follow indentation rulesAaron Patterson2016-02-111-5/+11
* make the logger method always return somethingAaron Patterson2016-02-111-4/+9
* Merge pull request #18109 from k0kubun/unscoped-joinsSean Griffin2016-02-114-6/+29
|\
| * Allow `joins` to be unscopedTakashi Kokubun2016-01-314-6/+31
* | Merge pull request #23581 from diego-silva/uniqueness-validator-pk-fixSean Griffin2016-02-112-1/+12
|\ \
| * | UniquenessValidator exclude itself when PK changedDiego Silva2016-02-092-1/+12
* | | Ensure prepared statement caching still occurs with Adequate RecordSean Griffin2016-02-114-7/+7
* | | Merge pull request #23605 from y-yagi/remove_warnings_in_finder_methodsKasper Timm Hansen2016-02-111-4/+4
|\ \ \
| * | | remove warnings from FinderMethodsyuuji.yaginuma2016-02-111-4/+4
* | | | Merge pull request #23604 from tenderlove/sort-templatesAaron Patterson2016-02-101-4/+4
|\ \ \ \
| * | | | sort templates after looking them up in the from the paths cacheAaron Patterson2016-02-101-4/+4
* | | | | Merge pull request #23606 from supremebeing7/patch-1Jon Moss2016-02-101-0/+22
|\ \ \ \ \
| * | | | | Update active_record_querying.mdMark J. Lehman2016-02-101-0/+22
* | | | | | Merge pull request #23596 from afn/issue-23058Aaron Patterson2016-02-102-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Converting backtrace to strings before calling set_backtraceTony Novak2016-02-102-3/+3
* | | | | | Merge pull request #23395 from PareshGupta/remove-unused-constantSantiago Pastorino2016-02-103-54/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove unused class AttributeMethodCachePareshGupta2016-02-022-25/+0
| * | | | | remove unused constants from activerecordPareshGupta2016-02-012-30/+6
* | | | | | check `supports_view_paths?` at registration timeAaron Patterson2016-02-101-7/+9
| |_|/ / / |/| | | |
* | | | | build scope chain functionally and remove cachingAaron Patterson2016-02-101-14/+40
* | | | | Merge pull request #23597 from kaspth/integration-response-parsingKasper Timm Hansen2016-02-104-23/+94
|\ \ \ \ \
| * | | | | Add request encoding and response parsing to changelog.Kasper Timm Hansen2016-02-101-0/+38
| * | | | | Add `parsed_body` to spare writing out parsing routines.Kasper Timm Hansen2016-02-103-23/+56
| | |/ / / | |/| | |
* | | | | Merge pull request #23528 from bensheldon/patch-1Richard Schneeman2016-02-101-1/+1
|\ \ \ \ \
| * | | | | Set postgresql poolsize via RAILS_MAX_THREADSBen Sheldon2016-02-101-1/+1
* | | | | | Merge pull request #23274 from KeithP/actioncable_loggingDavid Heinemeier Hansson2016-02-101-2/+16
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into actioncable_loggingkp2016-02-10258-1531/+3186
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Logs successful and invalid connections separatelykp2016-02-101-8/+12
| * | | | | | adds debug logging to actioncable connectkp2016-01-261-2/+12
* | | | | | | Merge pull request #23583 from brchristian/penultimateDavid Heinemeier Hansson2016-02-1010-2/+86
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | include activerecord and activesupport CHANGELOG entriesBrian Christian2016-02-102-0/+8
| * | | | | | rename to 'second_to_last' and 'third_to_last'Brian Christian2016-02-108-32/+32
| * | | | | | allow Array.penultimate and Array.antepenultiate access methodsBrian Christian2016-02-098-2/+78
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #21671 from kaspth/integration-request-encoding-helpersDavid Heinemeier Hansson2016-02-102-4/+122
|\ \ \ \ \ \
| * | | | | | Add `as` to encode a request as a specific mime type.Kasper Timm Hansen2016-01-042-4/+122
* | | | | | | Merge pull request #22772 from gsamokovarov/nack-template-errorDavid Heinemeier Hansson2016-02-101-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix edge case with ActionView::Template::Error reraiseGenadi Samokovarov2015-12-231-0/+4
* | | | | | | | Merge pull request #23512 from y-yagi/set_association_name_to_fixtureDavid Heinemeier Hansson2016-02-103-11/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | set association name to generated fixtures if attribute is referenceyuuji.yaginuma2016-02-063-11/+10
* | | | | | | | | Merge pull request #23587 from wallclockbuilder/patch-1Vipul A M2016-02-101-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix tiny grammar.Mawueli Kofi Adzoe2016-02-091-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #23586 from jhcole/masterप्रथमेश Sonpatki2016-02-101-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix typoJohn Cole2016-02-091-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #23584 from mgm702/fix_grammar_errors_in_security_and_migr...Jon Moss2016-02-092-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed grammatical errors in rails docs [ci skip]Matt Michnal2016-02-092-4/+4
|/ / / / / / / / /