aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Remove some comments about Ruby 1.9 behaviorsRafael Mendonça França2015-01-046-9/+9
* | | Remove wrong TODO commentRafael Mendonça França2015-01-041-1/+1
* | | No need to disable sidikiq tests with 1.9.3 anymoreRafael Mendonça França2015-01-041-11/+0
* | | Remove debugger supportRafael Mendonça França2015-01-0414-138/+8
* | | Remove version conditional for calling GC.disableRafael Mendonça França2015-01-041-1/+1
* | | Remove version conditional for find_template_pathsRafael Mendonça França2015-01-041-18/+6
* | | Remove LoadError#path hack for Ruby 1.9claudiob2015-01-041-2/+0
* | | Remove Thread hack for Ruby 1.9claudiob2015-01-041-23/+18
* | | Remove Psych hack for Ruby 1.9claudiob2015-01-041-10/+1
* | | Remove hack to support BigDecimal in Ruby 1.9claudiob2015-01-042-21/+3
* | | remove files which is dependent on ruby1.9 as we do not support Ruby1.9Kuldeep Aggarwal2015-01-043-55/+27
* | | Merge pull request #18217 from robertomiranda/has_secure_tokenDavid Heinemeier Hansson2015-01-047-0/+104
|\ \ \
| * | | Add has_secure_token to Active Recordrobertomiranda2015-01-047-0/+104
| |/ /
* / / Simplify boolean casting logicCarlos Antonio da Silva2015-01-041-3/+1
|/ /
* | Merge pull request #18327 from claudiob/remove-unneeded-requireRafael Mendonça França2015-01-043-3/+0
|\ \
| * | Remove unneeded `require 'as/deprecation'`claudiob2015-01-043-3/+0
|/ /
* | Fix CHANGELOG [ci skip]Rafael Mendonça França2015-01-041-0/+2
* | Merge pull request #18321 from mackshkatz/masterRafael Mendonça França2015-01-041-1/+1
|\ \
| * | Add missing information regarding callbacksMax Katz2015-01-041-1/+1
* | | Merge pull request #18325 from rafaelfranca/rm-remove-deprecationsRafael Mendonça França2015-01-0492-1433/+339
|\ \ \
| * | | Remove unneeded requiresRafael Mendonça França2015-01-049-12/+0
| * | | Remove deprecated `test:all` and `test:all:db` tasksRafael Mendonça França2015-01-042-23/+2
| * | | Remove deprecated `Rails::Rack::LogTailer`Rafael Mendonça França2015-01-043-39/+4