aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Revert "`belongs_to :touch` behavior now touches old association ↵Andrew White2013-04-243-1/+78
| | | | | | | | | when transitioning to new association" until a proper fix is found for #10197" This reverts commit 7389df139a35436f00876c96d20e81ba23c93f0a. Conflicts: activerecord/test/cases/timestamp_test.rb
* Merge pull request #10324 from prijutme4ty/guides_fixXavier Noria2013-04-241-1/+1
|\ | | | | fixed missing comma in example
| * fixed missing comma in exampleIlya Vorontsov2013-04-241-1/+1
|/
* Add test for `format: false` with resources - closes #10323Andrew White2013-04-241-0/+29
|
* Remove test case also related to the belongs_to touch featureDavid Heinemeier Hansson2013-04-231-20/+0
|
* Revert "`belongs_to :touch` behavior now touches old association when ↵David Heinemeier Hansson2013-04-233-58/+1
| | | | transitioning to new association" until a proper fix is found for #10197
* Merge pull request #10317 from arabonradar/ar_having_values_bug_fixRafael Mendonça França2013-04-232-1/+8
|\ | | | | ActiveRecord having clause bug fix
| * When empty options passed to having clause having_values was [nil] but ↵Fyodor2013-04-232-1/+8
| | | | | | | | should be empty.
* | Merge pull request #10318 from vipulnsward/refactor_obviousGuillermo Iguaran2013-04-231-4/+1
|\ \ | |/ |/| refactor initialization of array
| * refactor initialization of arrayVipul A M2013-04-231-4/+1
| |
* | Adjust for daylight savings in String#to_timeAndrew White2013-04-232-10/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes in b79adc4323 had a bug where if the time in the String was in standard time but the current time was in daylight savings then the calculated adjustment was off by an hour. This commit fixes this and adds extra tests for the following: * time in string is standard time, current time is standard time * time in string is standard time, current time is daylight savings * time in string is daylight savings, current time is standard time * time in string is daylight savings, current time is daylight savings Fixes #10306.
* | ActiveRecord -> Active RecordXavier Noria2013-04-222-1/+2
| |
* | applies documentation guidelinesXavier Noria2013-04-221-11/+12
| |
* | Merge pull request #10301 from vipulnsward/extract_in_mapperAndrew White2013-04-221-2/+4
|\ \ | |/ |/| extract arrays to constants in Mapper
| * extract arrays to constants in MapperVipul A M2013-04-221-2/+4
| |
* | Merge pull request #10302 from vipulnsward/remove_redundant_varCarlos Antonio da Silva2013-04-221-2/+0
|\ \ | | | | | | Remove redundant variable
| * | remove redundant variableVipul A M2013-04-221-2/+0
| |/
* | Merge pull request #10299 from econsultancy/use-method-not-allowed-exceptionAndrew White2013-04-224-0/+18
|\ \ | |/ |/| Use MethodNotAllowed exception rather than UnknownHttpMethod
| * Return a 405 response for unknown HTTP methodsLewis Marshall2013-04-224-0/+18
| |
* | Merge pull request #10285 from wangjohn/subscriber_registryCarlos Antonio da Silva2013-04-221-2/+20
|\ \ | | | | | | Created a registry for ActiveSupport::Subscriber queues
| * | Created a registry based on the +PerThreadRegistry+ module forwangjohn2013-04-221-2/+20
|/ / | | | | | | subscriber queues. Helps limit the number of thread locals.
* | Merge pull request #10295 from senny/10237_dirty_with_nullable_datetimeCarlos Antonio da Silva2013-04-221-3/+5
|\ \ | | | | | | Also assign nil in dirty nullable_datetime test. Closes #10237
| * | also assign nil in dirty nullable_datetime test. #10237Yves Senn2013-04-221-3/+5
| |/
* | Merge pull request #10292 from matthewrobertson/fix-update-counter-cache-on-pushCarlos Antonio da Silva2013-04-223-3/+22
|\ \ | | | | | | Update counter cache when pushing into association
| * | Update counter cache when pushing into associationMatthew Robertson2013-04-213-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes a regression bug in which counter_cache columns were not being updated correctly when newly created records were being pushed into an assocation. EG: # this was fine @post.comment.create! # this was fine @comment = Comment.first @post.comments << @comment # this would not update counters @post.comments << Comment.create!
* | | Merge pull request #10297 from vipulnsward/dont_mutate_in_rack_responseAndrew White2013-04-221-1/+2
|\ \ \ | |_|/ |/| | extract no content response codes to a constant
| * | extract no content response codes to a constantVipul A M2013-04-221-1/+2
| | |
* | | Move CHANGELOG entry to topRafael Mendonça França2013-04-221-4/+4
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #10096 from benofsky/fix_skipping_object_callback_filtersRafael Mendonça França2013-04-213-2/+43
|\ \ \ | |/ / |/| | Fixes skipping object callback filters
| * | Fixes skipping object callback filtersBen McRedmond2013-04-043-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows you to skip callbacks that are defined by objects, e.g. for `ActionController`: skip_after_filter MySpecialFilter Previously this didn't work due to a bug in how Rails compared callbacks in `Callback#matches?`. When a callback is compiled, if it's an object filter (i.e. not a method, proc, etc.), `Callback` now defines a method on `@klass` that is derived from the class name rather than `@callback_id`. So, when `skip_callback` tries to find the appropriate callback to remove, `Callback` can regenerate the method name for the filter object and return the correct value for `Callback#matches?`.
* | | Merge pull request #10293 from vipulnsward/dont_mutate_callbackRafael Mendonça França2013-04-211-1/+3
|\ \ \ | |_|/ |/| | extract array to a constant
| * | extract array to a constantVipul A M2013-04-221-1/+3
|/ /
* | Merge pull request #10290 from buddhamagnet/masterSantiago Pastorino2013-04-211-1/+3
|\ \ | | | | | | Extract path into variable
| * | extract path into variablebuddhamagnet2013-04-211-1/+3
|/ /
* | Merge pull request #10289 from maratvmk/readmeSantiago Pastorino2013-04-211-2/+2
|\ \ | | | | | | fix README links in the main README.md
| * | fix README links in the main README.mdMarat Kazbekov2013-04-221-2/+2
|/ /
* | Merge pull request #10286 from ↵Carlos Antonio da Silva2013-04-211-2/+2
|\ \ | | | | | | | | | | | | neerajdotname/fix-wrong-test-name-and-failure-message fix wrong test description and failure message
| * | fix wrong test description and failure messageNeeraj Singh2013-04-211-2/+2
| | |
* | | Merge pull request #10284 from neerajdotname/missing-active-model-testsGuillermo Iguaran2013-04-211-0/+21
|\ \ \ | | | | | | | | Added tests for if condition in Active Model callbacks
| * | | Added tests for if condition in Active Model callbacksNeeraj Singh2013-04-211-0/+21
| |/ /
* | | Merge pull request #10283 from wangjohn/remove_tests_for_deprecated_optionsSantiago Pastorino2013-04-211-8/+0
|\ \ \ | | | | | | | | Removing tests for deprecated options in active support.
| * | | Removing tests for deprecated options in active support. Thewangjohn2013-04-211-8/+0
|/ / / | | | | | | | | | | | | +use_full_path+ option was removed in 3b3790a4 and passing the template handler to render was deprecated in 43d27e91.
* | | Merge pull request #10280 from vipulnsward/fix_typos_tempSteve Klabnik2013-04-212-2/+2
|\ \ \ | | | | | | | | fix typos [ci skip]
| * | | fix typosVipul A M2013-04-212-2/+2
| | | |
* | | | Merge pull request #10275 from buddhamagnet/masterCarlos Antonio da Silva2013-04-201-2/+1
|\ \ \ \ | | | | | | | | | | Increase readability of ternary statement in build method
| * | | | Increase readability of ternary statement in build methodbuddhamagnet2013-04-201-2/+1
|/ / / /
* | | | if singletons belong to the contract, test themXavier Noria2013-04-202-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Object#respond_to? returns singletons and thus we inherit that contract. The implementation of the predicate is good, but the test is only checking boolean semantics, which in this case is not enough.
* | | | Rewrites a CHANGELOG entry.Xavier Noria2013-04-201-16/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The entry is basically copy & paste of the commit message, but the CHANGELOG has a different purpose than Git history, it just communicates what is new: * No need to explain why did the bug happen (unless it is truly relevant). * No need to explain how was the bug fixed. * Whether the user gives new names to columns does not really matter, use of select to cherry-pick a column for example also presented that behaviour. Non-selected attributes are the key, either because they were not included in the selected list, or because they were but with a different alias. * In the case of an attribute alias, what you really want to depict is that respond_to? returns false for the original attribute name.
* | | Merge pull request #10273 from prathamesh-sonpatki/AR-typosXavier Noria2013-04-191-2/+2
|\ \ \ | |/ / |/| | Typo Fix in AR CHANGELOG [ci skip]
| * | Typo Fix in AR CHANGELOG [ci skip]Prathamesh Sonpatki2013-04-201-2/+2
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 17:58:40 +0000