aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* replacing 'attribute' method with an aliasGeorge Millo2015-01-061-3/+2
* Merge pull request #18354 from simi/improve-request-forgery-documentationDavid Heinemeier Hansson2015-01-051-3/+3
|\
| * Improve protect_from_forgery documentation. [ci skip].Josef Šimánek2015-01-061-3/+3
* | Merge pull request #18356 from georgemillo/singularizeRafael Mendonça França2015-01-051-2/+2
|\ \
| * | removing unecessary parameter in private methodGeorge Millo2015-01-061-2/+2
* | | Merge pull request #18355 from georgemillo/docsSean Griffin2015-01-051-0/+3
|\ \ \
| * | | adding documentation for 'remove_possible_method' and 'redefine_method' [ci s...George Millo2015-01-051-0/+3
| |/ /
* | | Merge pull request #18350 from brainopia/fix_build_from_bind_valuesSean Griffin2015-01-052-2/+12
|\ \ \ | |_|/ |/| |
| * | Correctly fetch bind_values from join in subquerybrainopia2015-01-062-2/+12
* | | Define attribute methods before attempting to populate recordsSean Griffin2015-01-051-1/+1
* | | Whitespace fixes from #18349Sean Griffin2015-01-051-2/+1
* | | Merge pull request #18349 from jdelStrother/primarykeylessSean Griffin2015-01-052-1/+23
|\ \ \ | |/ / |/| |
| * | Fix rollback of primarykey-less tablesJonathan del Strother2015-01-052-1/+23
* | | Avoid changing the global state on the testsRafael Mendonça França2015-01-051-1/+6
* | | Merge pull request #17676 from tigrish/fix_custom_i18n_exception_handler_regr...Rafael Mendonça França2015-01-052-6/+27
|\ \ \
| * | | Fix I18n regression introduced by #13832Christopher Dell2014-11-192-6/+27
* | | | Merge pull request #17720 from rzane/firebird-test-supportRafael Mendonça França2015-01-055-21/+28
|\ \ \ \
| * | | | Add firebird support to test suiteRay Zane2015-01-055-21/+28
|/ / / /
* | | | Merge pull request #18344 from jonatack/patch-1Rafael Mendonça França2015-01-051-5/+5
|\ \ \ \
| * | | | Clean up secure_token_testJon Atack2015-01-051-5/+5
* | | | | Merge pull request #18345 from mtthgn/patch-1Rafael Mendonça França2015-01-051-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix TypeError in Fixture creationMatt Hogan2015-01-051-1/+1
|/ / / /
* | | | reflects changes in 34cd7e2 in the index [ci skip]Xavier Noria2015-01-051-3/+3
* | | | Merge pull request #18341 from aditya-kapoor/remove-unneeded-checksRafael Mendonça França2015-01-051-2/+1
|\ \ \ \
| * | | | remove unneeded check since /_one_time_conditions/ is removedAditya Kapoor2015-01-051-2/+1
| | |_|/ | |/| |
* | | | Merge pull request #18342 from brainopia/reset_template_assertion_without_war...Rafael Mendonça França2015-01-051-2/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Reset template assertions without warningsbrainopia2015-01-051-2/+4
|/ / /
* | | Fix typo in changelog [ci skip]Carlos Antonio da Silva2015-01-051-1/+1
* | | remove deprecated support to preload instance-dependent associaitons.Yves Senn2015-01-054-32/+16
* | | remove deprecated support for PG ranges with exclusive lower bounds.Yves Senn2015-01-053-37/+10
* | | can't kill thread with in-memory db. fixes `rake test:sqlite3_mem`.Yves Senn2015-01-051-0/+2
* | | remove deprecation warning when modifying a Relation with cached arel.Yves Senn2015-01-053-21/+27
* | | add punctuation. [ci skip]Yves Senn2015-01-051-2/+2
* | | Merge pull request #18332 from gchan/update-adequate-record-notesRafael Mendonça França2015-01-041-0/+3
|\ \ \
| * | | [guides] Added newer find_by syntax example in 4.2 release notes for Adequate...Gordon Chan2015-01-051-0/+3
* | | | Merge pull request #18331 from simi/document-protect-from-forgery-optionsDavid Heinemeier Hansson2015-01-041-8/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Document all options for protect_from_forgery.Josef Šimánek2015-01-041-8/+2
|/ / /
* | | Merge pull request #18090 from egilburg/patch-3Rafael Mendonça França2015-01-041-9/+1
|\ \ \
| * | | simplify ActiveSupport.test_order definitionEugene Gilburg2014-12-181-9/+2
* | | | Do not include Active Support on testsRafael Mendonça França2015-01-043-30/+24
* | | | Merge pull request #18328 from brainopia/remove_tz_proxyRafael Mendonça França2015-01-043-12/+7
|\ \ \ \
| * | | | Use directly TZInfo::Timezone without proxybrainopia2015-01-043-12/+7
* | | | | Remove unused requireCarlos Antonio da Silva2015-01-041-1/+0
* | | | | Remove respond_to/respond_with placeholder methodsCarlos Antonio da Silva2015-01-043-52/+5
* | | | | Remove extra class_eval for Ruby 1.9Carlos Antonio da Silva2015-01-041-5/+2
* | | | | Remove workaround to a Ruby 2.0.0 bugRafael Mendonça França2015-01-041-7/+0
* | | | | Remove Struct#to_h backportRafael Mendonça França2015-01-044-18/+5
* | | | | String already respond_to scrub at Ruby 2.2Rafael Mendonça França2015-01-041-2/+1
* | | | | singleton_class? is already pressent at Ruby 2.2Rafael Mendonça França2015-01-041-8/+0
* | | | | Remove unneeded Time patch to support Ruby 1.9Rafael Mendonça França2015-01-042-30/+2