Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #17720 from rzane/firebird-test-support | Rafael Mendonça França | 2015-01-05 | 5 | -21/+28 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add Firebird support to test suite | |||||
| * | | | | | | Add firebird support to test suite | Ray Zane | 2015-01-05 | 5 | -21/+28 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #18344 from jonatack/patch-1 | Rafael Mendonça França | 2015-01-05 | 1 | -5/+5 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Clean up secure_token_test | |||||
| * | | | | | | Clean up secure_token_test | Jon Atack | 2015-01-05 | 1 | -5/+5 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #18345 from mtthgn/patch-1 | Rafael Mendonça França | 2015-01-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Fix TypeError in Fixture creation | |||||
| * | | | | | | Fix TypeError in Fixture creation | Matt Hogan | 2015-01-05 | 1 | -1/+1 | |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby 4.2 started doing `value.gsub('$LABEL', label)` for fixture label interpolation, but you can have have valid YAML where `label` isn't a String. For example: ```YAML 0: name: John email: johndoe@gmail.com 1: name: Jane email: janedoe@gmail.com ``` This YAML will create a label that is a Fixnum, causing `TypeError: no implicit conversion of Fixnum into String.` | |||||
* | | | | | | reflects changes in 34cd7e2 in the index [ci skip] | Xavier Noria | 2015-01-05 | 1 | -3/+3 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #18341 from aditya-kapoor/remove-unneeded-checks | Rafael Mendonça França | 2015-01-05 | 1 | -2/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | remove unneeded check since /_one_time_conditions/ is not present anymore. | |||||
| * | | | | | | remove unneeded check since /_one_time_conditions/ is removed | Aditya Kapoor | 2015-01-05 | 1 | -2/+1 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #18342 from ↵ | Rafael Mendonça França | 2015-01-05 | 1 | -2/+4 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | brainopia/reset_template_assertion_without_warnings Reset template assertions without warnings | |||||
| * | | | | | Reset template assertions without warnings | brainopia | 2015-01-05 | 1 | -2/+4 | |
|/ / / / / | ||||||
* | | | | | Fix typo in changelog [ci skip] | Carlos Antonio da Silva | 2015-01-05 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | remove deprecated support to preload instance-dependent associaitons. | Yves Senn | 2015-01-05 | 4 | -32/+16 | |
| | | | | | | | | | | | | | | | | | | | | Addresses https://github.com/rails/rails/commit/ed56e596a0467390011bc9d56d462539776adac1#commitcomment-9145960 | |||||
* | | | | | remove deprecated support for PG ranges with exclusive lower bounds. | Yves Senn | 2015-01-05 | 3 | -37/+10 | |
| | | | | | | | | | | | | | | | | | | | | addresses https://github.com/rails/rails/commit/91949e48cf41af9f3e4ffba3e5eecf9b0a08bfc3#commitcomment-9144563 | |||||
* | | | | | can't kill thread with in-memory db. fixes `rake test:sqlite3_mem`. | Yves Senn | 2015-01-05 | 1 | -0/+2 | |
| | | | | | ||||||
* | | | | | remove deprecation warning when modifying a Relation with cached arel. | Yves Senn | 2015-01-05 | 3 | -21/+27 | |
| | | | | | | | | | | | | | | | | | | | | This adresses https://github.com/rails/rails/commit/1b7aa62b184c4410c99208f71b59bbac5c5f03be#commitcomment-9147803 | |||||
* | | | | | add punctuation. [ci skip] | Yves Senn | 2015-01-05 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | Merge pull request #18332 from gchan/update-adequate-record-notes | Rafael Mendonça França | 2015-01-04 | 1 | -0/+3 | |
|\ \ \ \ \ | | | | | | | | | | | | | Include newer `find_by` syntax example in 4.2 release notes for Adequate Record | |||||
| * | | | | | [guides] Added newer find_by syntax example in 4.2 release notes for ↵ | Gordon Chan | 2015-01-05 | 1 | -0/+3 | |
| | |_|_|/ | |/| | | | | | | | | | | | | | Adequate Record [skip ci] | |||||
* | | | | | Merge pull request #18331 from simi/document-protect-from-forgery-options | David Heinemeier Hansson | 2015-01-04 | 1 | -8/+2 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Document all options for protect_from_forgery. | |||||
| * | | | | Document all options for protect_from_forgery. | Josef Šimánek | 2015-01-04 | 1 | -8/+2 | |
|/ / / / | | | | | | | | | | | | | [ci skip] | |||||
* | | | | Merge pull request #18090 from egilburg/patch-3 | Rafael Mendonça França | 2015-01-04 | 1 | -9/+1 | |
|\ \ \ \ | | | | | | | | | | | | | | | | simplify ActiveSupport.test_order definition | |||||
| * | | | | simplify ActiveSupport.test_order definition | Eugene Gilburg | 2014-12-18 | 1 | -9/+2 | |
| | | | | | ||||||
* | | | | | Do not include Active Support on tests | Rafael Mendonça França | 2015-01-04 | 3 | -30/+24 | |
| | | | | | | | | | | | | | | | | | | | | It was not done to be included | |||||
* | | | | | Merge pull request #18328 from brainopia/remove_tz_proxy | Rafael Mendonça França | 2015-01-04 | 3 | -12/+7 | |
|\ \ \ \ \ | | | | | | | | | | | | | Use directly TZInfo::Timezone without proxy | |||||
| * | | | | | Use directly TZInfo::Timezone without proxy | brainopia | 2015-01-04 | 3 | -12/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since real timezone is loaded anyway in `#utc_offset` which is called during `#create` | |||||
* | | | | | | Remove unused require | Carlos Antonio da Silva | 2015-01-04 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was used by the respond_to/respond_with implementation on this file, which is now extracted to the responders gem. | |||||
* | | | | | | Remove respond_to/respond_with placeholder methods | Carlos Antonio da Silva | 2015-01-04 | 3 | -52/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This functionality has been extracted to the responders gem. | |||||
* | | | | | | Remove extra class_eval for Ruby 1.9 | Carlos Antonio da Silva | 2015-01-04 | 1 | -5/+2 | |
| | | | | | | ||||||
* | | | | | | Remove workaround to a Ruby 2.0.0 bug | Rafael Mendonça França | 2015-01-04 | 1 | -7/+0 | |
| | | | | | | ||||||
* | | | | | | Remove Struct#to_h backport | Rafael Mendonça França | 2015-01-04 | 4 | -18/+5 | |
| | | | | | | ||||||
* | | | | | | String already respond_to scrub at Ruby 2.2 | Rafael Mendonça França | 2015-01-04 | 1 | -2/+1 | |
| | | | | | | ||||||
* | | | | | | singleton_class? is already pressent at Ruby 2.2 | Rafael Mendonça França | 2015-01-04 | 1 | -8/+0 | |
| | | | | | | ||||||
* | | | | | | Remove unneeded Time patch to support Ruby 1.9 | Rafael Mendonça França | 2015-01-04 | 2 | -30/+2 | |
| | | | | | | ||||||
* | | | | | | Remove some comments about Ruby 1.9 behaviors | Rafael Mendonça França | 2015-01-04 | 6 | -9/+9 | |
| | | | | | | ||||||
* | | | | | | Remove wrong TODO comment | Rafael Mendonça França | 2015-01-04 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | No need to disable sidikiq tests with 1.9.3 anymore | Rafael Mendonça França | 2015-01-04 | 1 | -11/+0 | |
| | | | | | | ||||||
* | | | | | | Remove debugger support | Rafael Mendonça França | 2015-01-04 | 14 | -138/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bebugger doesn't work with Ruby 2.2 so we don't need to support it anymore | |||||
* | | | | | | Remove version conditional for calling GC.disable | Rafael Mendonça França | 2015-01-04 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Remove version conditional for find_template_paths | Rafael Mendonça França | 2015-01-04 | 1 | -18/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we only support Ruby 2.2+ we don't need this conditional anymore | |||||
* | | | | | | Remove LoadError#path hack for Ruby 1.9 | claudiob | 2015-01-04 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that Rails requires Ruby >= 2.0 there is need to skip the `test_depend_on_path` test. | |||||
* | | | | | | Remove Thread hack for Ruby 1.9 | claudiob | 2015-01-04 | 1 | -23/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hack so skip a Thread test for Ruby 1.9 can be removed now that Rails requires Ruby >= 2.0. Conflicts: activerecord/test/cases/transactions_test.rb | |||||
* | | | | | | Remove Psych hack for Ruby 1.9 | claudiob | 2015-01-04 | 1 | -10/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A special `if` statement to support `Psych` for Ruby < 2.0 can be dropped now that Rails requires Ruby >= 2.0. | |||||
* | | | | | | Remove hack to support BigDecimal in Ruby 1.9 | claudiob | 2015-01-04 | 2 | -21/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that Rails requires Ruby >= 2.0, there is no need to check whether `BigDecimal` exists or not. | |||||
* | | | | | | remove files which is dependent on ruby1.9 as we do not support Ruby1.9 | Kuldeep Aggarwal | 2015-01-04 | 3 | -55/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/attribute_methods/read.rb | |||||
* | | | | | | Merge pull request #18217 from robertomiranda/has_secure_token | David Heinemeier Hansson | 2015-01-04 | 7 | -0/+104 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add has_secure_token to Active Record | |||||
| * | | | | | | Add has_secure_token to Active Record | robertomiranda | 2015-01-04 | 7 | -0/+104 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update SecureToken Docs Add Changelog entry for has_secure_token [ci skip] | |||||
* / / / / / | Simplify boolean casting logic | Carlos Antonio da Silva | 2015-01-04 | 1 | -3/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #18327 from claudiob/remove-unneeded-require | Rafael Mendonça França | 2015-01-04 | 3 | -3/+0 | |
|\ \ \ \ \ | | | | | | | | | | | | | Remove unneeded `require 'as/deprecation'` | |||||
| * | | | | | Remove unneeded `require 'as/deprecation'` | claudiob | 2015-01-04 | 3 | -3/+0 | |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | Tests should still pass after removing `require 'active_support/deprecation'` from these files since the related deprecations have been removed. |