aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Allow fixtures YAML files to set the model class in the file itselfRoque Pinel2015-09-119-12/+130
* Merge pull request #21585 from lachlanjc/patch-1Eileen M. Uchitelle2015-09-101-1/+1
|\
| * Remove RHTML reference in Action Controller docs [ci skip]Lachlan Campbell2015-09-101-1/+1
|/
* Merge pull request #21584 from claudiob/remove-hawd-docClaudio B.2015-09-101-3/+2
|\
| * Remove wrong doc line about AC::Parametersclaudiob2015-09-101-3/+2
* | Merge pull request #21575 from y-yagi/description_of_passing_block_to_add_sourceYves Senn2015-09-101-1/+9
|\ \
| * | add description of passing a block to `add_source` [ci skip]yuuji.yaginuma2015-09-101-1/+9
|/ /
* | Explicitly require AR/attribute where using itAkira Matsuda2015-09-101-0/+2
* | Merge pull request #21567 from y-yagi/fix_inspect_docZachary Scott2015-09-091-1/+1
|\ \
| * | fix wrong method used in the TimeWithZone#inspect method docs [ci skip]yuuji.yaginuma2015-09-101-1/+1
* | | Merge pull request #21333 from imtayadeway/ar-querying-docsEileen M. Uchitelle2015-09-091-17/+16
|\ \ \
| * | | [ci skip] Update MySQL docs reference to latestTim Wade2015-09-091-1/+1
| * | | [ci skip] Improve readability in AR querying guideTim Wade2015-09-091-16/+15
* | | | remove dead code.Yves Senn2015-09-092-7/+1
* | | | Update documentation to reflect Rack::Session::Abstract changeseileencodes2015-09-091-1/+1
* | | | Handle Content-Types that are not :json, :xml, or :url_encoded_formeileencodes2015-09-092-2/+30
* | | | Merge pull request #21486 from bogdan/refactor-has-many-counter-cacheEileen M. Uchitelle2015-09-094-71/+61
|\ \ \ \
| * | | | HasManyAssociation: moved half of counter cache code to reflectionBogdan Gusiev2015-09-034-71/+61
* | | | | Merge pull request #21529 from rngtng/move-migrations-paths-to-database-taskYves Senn2015-09-091-7/+7
|\ \ \ \ \
| * | | | | Use `ActiveRecord::Tasks::DatabaseTasks.migrations_paths` instead of `Migrato...Tobias Bielohlawek2015-09-071-9/+8
* | | | | | remove dead code.Yves Senn2015-09-091-4/+0
* | | | | | adjust method visibility according to it's usage.Yves Senn2015-09-091-18/+18
* | | | | | Don't set the default argumentRafael Mendonça França2015-09-091-1/+1
* | | | | | Invert the conditionalRafael Mendonça França2015-09-091-1/+1
* | | | | | Remove dead codeRafael Mendonça França2015-09-091-6/+0
* | | | | | Revert "Merge pull request #20080 from robertjlooby/fix_overwriting_by_dynami...Rafael Mendonça França2015-09-093-24/+3
* | | | | | Merge pull request #20080 from robertjlooby/fix_overwriting_by_dynamic_findersRafael Mendonça França2015-09-093-3/+24
|\ \ \ \ \ \
| * | | | | | put dynamic matchers on the GeneratedAssociationMethods instead of modelRob Looby2015-05-083-3/+24
* | | | | | | Merge pull request #21554 from ronakjangir47/added_nodocRafael Mendonça França2015-09-091-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Added nodoc for `arel` method which returns object of private api. [ci skip]Ronak Jangir2015-09-091-1/+1
* | | | | | | | Merge pull request #20921 from pboling/fix-sql-colors-in-log-subscriberRafael Mendonça França2015-09-093-8/+126
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove extraneous `then` from case statementPeter Boling2015-07-172-14/+39
| * | | | | | | | Improve sql logging coloration in `ActiveRecord::LogSubscriber`.Peter Boling2015-07-174-8/+144
* | | | | | | | | Merge pull request #21560 from ravindrakumawat/american-styleRafael Mendonça França2015-09-091-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rails documentation use american english.[ci skip]ravindra kumar kumawat2015-09-091-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #21559 from claudiob/timestamp-docClaudio B.2015-09-081-5/+12
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Fix docs of AR::Timestamp to match #15726claudiob2015-09-081-5/+12
|/ / / / / / / /
* | | | | | | | ensure that mutating headers will impact the content_type methodAaron Patterson2015-09-081-0/+5
* | | | | | | | mime_type will always return a stringAaron Patterson2015-09-081-2/+1
* | | | | | | | remove `parse_content_type` parameterAaron Patterson2015-09-081-6/+7
* | | | | | | | avoid allocations when there is no content type setAaron Patterson2015-09-081-1/+2
* | | | | | | | handle implicit rendering correctlyAaron Patterson2015-09-081-3/+4
* | | | | | | | remove mime type lookups when parsing the content typeAaron Patterson2015-09-081-5/+5
* | | | | | | | refactor content type settingAaron Patterson2015-09-081-44/+39
* | | | | | | | make Content-Type header the canonical location for content-type infoAaron Patterson2015-09-081-34/+50
* | | | | | | | pull content type parsing in to a methodAaron Patterson2015-09-081-7/+15
* | | | | | | | ensure that content type defaults to text / html when setting charsetAaron Patterson2015-09-081-0/+7
* | | | | | | | push content_type assigment in to metalAaron Patterson2015-09-083-9/+11
* | | | | | | | avoid useless string allocationsAaron Patterson2015-09-082-2/+1
* | | | | | | | use accessors instead of manipulating the hashAaron Patterson2015-09-081-2/+2