aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #27604 from prathamesh-sonpatki/dont-generate-erb-views-fo...Kasper Timm Hansen2017-01-083-1/+18
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Don't generate HTML/ERB templates for scaffold controller with --api flagPrathamesh Sonpatki2017-01-073-1/+18
* | | | | Merge pull request #27603 from prathamesh-sonpatki/fix-random-failureSantiago Pastorino2017-01-081-0/+2
|\ \ \ \ \
| * | | | | Fix random failure related to migration environmentPrathamesh Sonpatki2017-01-071-0/+2
| |/ / / /
* | | | | Merge pull request #27602 from prathamesh-sonpatki/followup-27596Santiago Pastorino2017-01-081-1/+8
|\ \ \ \ \
| * | | | | Followup of #27596, test output of "run" method as wellPrathamesh Sonpatki2017-01-071-1/+8
| |/ / / /
* | | | | Merge pull request #27598 from NickLaMuro/fix-deep-nesting-where-clauses-with...Sean Griffin2017-01-072-1/+18
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Adds .to_s to table_name callNick LaMuro2017-01-061-1/+1
| * | | | Add failing test for where with joinsNick LaMuro2017-01-061-0/+17
| | |/ / | |/| |
* | | | Merge pull request #27596 from schneems/schneems/migrator-resultRichard Schneeman2017-01-062-2/+18
|\ \ \ \ | |/ / / |/| | |
| * | | Preserve `up` and `down` return typeschneems2017-01-062-2/+18
|/ / /
* | | Merge pull request #27392 from y-yagi/use_same_class_on_compactSean Griffin2017-01-062-0/+14
|\ \ \
| * | | ensure `#compact` of HWIDA to return HWIDAyuuji.yaginuma2017-01-062-0/+14
* | | | Merge pull request #27227 from MQuy/allow-custom-content-type-in-mail-bodyRafael Mendonça França2017-01-063-4/+38
|\ \ \ \
| * | | | Remove unnecessary condition in content_typeMQuy2017-01-061-1/+1
| * | | | Add document in mailerMQuy2016-12-061-0/+13
| * | | | Fix wrong typo in testMQuy2016-12-051-1/+1
| * | | | Add changelog for custom content typeMQuy2016-12-012-0/+16
| * | | | allow context type when set body mailMQuy2016-11-302-4/+13
* | | | | Remove unneeded Deprecation silenceRafael Mendonça França2017-01-061-5/+3
* | | | | Merge pull request #27294 from eavgerinos/doc-ar-callbacks-orderRafael França2017-01-061-0/+49
|\ \ \ \ \
| * | | | | [ci skip] ActiveRecord: Document order of CallbacksAggelos Avgerinos2016-12-221-0/+49
* | | | | | Merge pull request #27586 from maclover7/jm-fix-27584Rafael França2017-01-062-3/+11
|\ \ \ \ \ \
| * | | | | | Update `cookies` helper on all HTTP requestsJon Moss2017-01-052-3/+11
|/ / / / / /
* | | | | | Privatize unneededly protected methods in Active RecordAkira Matsuda2017-01-055-16/+12
* | | | | | `self.` is not needed when calling its own instance methodAkira Matsuda2017-01-0560-71/+71
* | | | | | CI against jruby-9.1.6.0Akira Matsuda2017-01-051-3/+3
* | | | | | This method is never called since 8e633e505880755e7e366ccec2210bbe2b5436e7Akira Matsuda2017-01-051-7/+0
* | | | | | bundle u sqlite3Akira Matsuda2017-01-051-3/+3
* | | | | | Merge pull request #27580 from kamipo/optimize_information_schema_queryRafael França2017-01-051-0/+1
|\ \ \ \ \ \
| * | | | | | Optimizing information_schema query for `foreign_keys`Ryuta Kamizono2017-01-051-0/+1
* | | | | | | Fix style guide violationsRafael Mendonça França2017-01-055-9/+8
|/ / / / / /
* | | | | | Make sure we generate keys that can be used with the cipherRafael Mendonça França2017-01-041-4/+4
* | | | | | Merge pull request #26480 from tbrisker/fix-26461Rafael França2017-01-041-2/+7
|\ \ \ \ \ \
| * | | | | | Reword according to feedbackTomer Brisker2016-09-151-8/+7
| * | | | | | Clarify that mattr_* creates public methodsTomer Brisker2016-09-131-0/+6
* | | | | | | Merge pull request #27549 from mpugach/consider_params_in_current_pageRafael França2017-01-043-2/+20
|\ \ \ \ \ \ \
| * | | | | | | Add `check_parameters` option to `current_page?`Maksym Pugach2017-01-043-2/+20
* | | | | | | | Merge pull request #27578 from kenta-s/fix-typo-in-asset_pipeline_mdJon Moss2017-01-041-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix typo in asset_pipeline.md [ci skip]kenta-s2017-01-051-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #27575 from yahonda/diag_like_26370Rafael França2017-01-042-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Require "models/post" before "models/comment"Yasuo Honda2017-01-042-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #27446 from zachahn/asset-hash-md5-to-sha256Rafael França2017-01-041-22/+24
|\ \ \ \ \ \ \
| * | | | | | | Update asset fingerprinting informationZach Ahn2016-12-231-22/+24
* | | | | | | | String#end_with? should be faster than Regexp hereAkira Matsuda2017-01-051-1/+1
* | | | | | | | There's no such moduleAkira Matsuda2017-01-052-8/+8
* | | | | | | | No need to :doc: a public methodAkira Matsuda2017-01-051-1/+1
* | | | | | | | Merge pull request #27485 from cih/hmt-warningAndrew White2017-01-045-0/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | Raise error when has_many through is defined before through associationChris Holmes2017-01-045-0/+38
|/ / / / / / / /
* | | | | | | | Merge pull request #27552 from jarijokinen/fix-default-locale-code-exampleAndrew White2017-01-041-5/+10
|\ \ \ \ \ \ \ \