| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | Merge pull request #10330 from kennyj/fix_10067 | Rafael Mendonça França | 2013-04-24 | 3 | -1/+22 | |
| |\ \ \ \ | | | | | | | | | | | Serialized column should not be wrapped twice. Fix #10067. | |||||
| | * | | | | Added testcase for #10067 and a CHANGELOG entry about this change. | kennyj | 2013-04-25 | 2 | -0/+21 | |
| | | | | | | ||||||
| | * | | | | Fix a SystemStackError that occurs when using time zone aware attributes. | Dan Erikson | 2013-04-25 | 1 | -1/+1 | |
| |/ / / / | | | | | | | | | | | | | This fixes issue #10066 | |||||
| * | | | | Merge pull request #10331 from neerajdotname/exec-migration-in-transaction | Guillermo Iguaran | 2013-04-24 | 1 | -8/+9 | |
| |\ \ \ \ | | | | | | | | | | | Remove code duplication | |||||
| | * | | | | Remove code duplication | Neeraj Singh | 2013-04-24 | 1 | -8/+9 | |
| | | |/ / | |/| | | ||||||
| * | | | | Merge pull request #10256 from ↵ | Rafael Mendonça França | 2013-04-24 | 2 | -4/+4 | |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | wangjohn/moving_check_for_test_environment_into_rails_env Moved the check for the rails test environment into rails.rb Closes #10238 | |||||
| | * | | | Moved the check for the rails test environment into rails/test_unit so that you | wangjohn | 2013-04-23 | 2 | -4/+4 | |
| | | | | | | | | | | | | | | | | | can select frameworks separately when running rake test. | |||||
| * | | | | Lookup the class at runtime, not when the association is built | Andrew White | 2013-04-24 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trying to lookup the parent class when the association is being built runs the risk of generating uninitialized constant errors because classes haven't been fully defined yet. To work around this we look up the class at runtime through the `association` method. Fixes #10197. | |||||
| * | | | | Removed unused associations | Andrew White | 2013-04-24 | 1 | -2/+0 | |
| | | | | | ||||||
| * | | | | Reset the primary key for other tests | Andrew White | 2013-04-24 | 1 | -0/+2 | |
| | | | | | ||||||
| * | | | | added test cases for #10197 | Adam Gamble | 2013-04-24 | 1 | -0/+56 | |
| | | | | | ||||||
| * | | | | Revert "Revert "`belongs_to :touch` behavior now touches old association ↵ | Andrew White | 2013-04-24 | 3 | -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_fix | Xavier Noria | 2013-04-24 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | fixed missing comma in example | |||||
| | * | | | fixed missing comma in example | Ilya Vorontsov | 2013-04-24 | 1 | -1/+1 | |
| |/ / / | ||||||
| * / / | Add test for `format: false` with resources - closes #10323 | Andrew White | 2013-04-24 | 1 | -0/+29 | |
| |/ / | ||||||
| * | | Remove test case also related to the belongs_to touch feature | David Heinemeier Hansson | 2013-04-23 | 1 | -20/+0 | |
| | | | ||||||
| * | | Revert "`belongs_to :touch` behavior now touches old association when ↵ | David Heinemeier Hansson | 2013-04-23 | 3 | -58/+1 | |
| | | | | | | | | | transitioning to new association" until a proper fix is found for #10197 | |||||
| * | | Merge pull request #10317 from arabonradar/ar_having_values_bug_fix | Rafael Mendonça França | 2013-04-23 | 2 | -1/+8 | |
| |\ \ | | | | | | | ActiveRecord having clause bug fix | |||||
| | * | | When empty options passed to having clause having_values was [nil] but ↵ | Fyodor | 2013-04-23 | 2 | -1/+8 | |
| | | | | | | | | | | | | | should be empty. | |||||
| * | | | Merge pull request #10318 from vipulnsward/refactor_obvious | Guillermo Iguaran | 2013-04-23 | 1 | -4/+1 | |
| |\ \ \ | |/ / |/| | | refactor initialization of array | |||||
| | * | | refactor initialization of array | Vipul A M | 2013-04-23 | 1 | -4/+1 | |
| | | | | ||||||
| * | | | Adjust for daylight savings in String#to_time | Andrew White | 2013-04-23 | 2 | -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 Record | Xavier Noria | 2013-04-22 | 2 | -1/+2 | |
| | | | | ||||||
| * | | | applies documentation guidelines | Xavier Noria | 2013-04-22 | 1 | -11/+12 | |
| | | | | ||||||
| * | | | Merge pull request #10301 from vipulnsward/extract_in_mapper | Andrew White | 2013-04-22 | 1 | -2/+4 | |
| |\ \ \ | |/ / |/| | | extract arrays to constants in Mapper | |||||
| | * | | extract arrays to constants in Mapper | Vipul A M | 2013-04-22 | 1 | -2/+4 | |
| | | | | ||||||
| * | | | Merge pull request #10302 from vipulnsward/remove_redundant_var | Carlos Antonio da Silva | 2013-04-22 | 1 | -2/+0 | |
| |\ \ \ | | | | | | | | | Remove redundant variable | |||||
| | * | | | remove redundant variable | Vipul A M | 2013-04-22 | 1 | -2/+0 | |
| | |/ / | ||||||
| * | | | Merge pull request #10299 from econsultancy/use-method-not-allowed-exception | Andrew White | 2013-04-22 | 4 | -0/+18 | |
| |\ \ \ | |/ / |/| | | Use MethodNotAllowed exception rather than UnknownHttpMethod | |||||
| | * | | Return a 405 response for unknown HTTP methods | Lewis Marshall | 2013-04-22 | 4 | -0/+18 | |
| | | | | ||||||
| * | | | Merge pull request #10285 from wangjohn/subscriber_registry | Carlos Antonio da Silva | 2013-04-22 | 1 | -2/+20 | |
| |\ \ \ | | | | | | | | | Created a registry for ActiveSupport::Subscriber queues | |||||
| | * | | | Created a registry based on the +PerThreadRegistry+ module for | wangjohn | 2013-04-22 | 1 | -2/+20 | |
| |/ / / | | | | | | | | | | subscriber queues. Helps limit the number of thread locals. | |||||
| * | | | Merge pull request #10295 from senny/10237_dirty_with_nullable_datetime | Carlos Antonio da Silva | 2013-04-22 | 1 | -3/+5 | |
| |\ \ \ | | | | | | | | | Also assign nil in dirty nullable_datetime test. Closes #10237 | |||||
| | * | | | also assign nil in dirty nullable_datetime test. #10237 | Yves Senn | 2013-04-22 | 1 | -3/+5 | |
| | |/ / | ||||||
| * | | | Merge pull request #10292 from matthewrobertson/fix-update-counter-cache-on-push | Carlos Antonio da Silva | 2013-04-22 | 3 | -3/+22 | |
| |\ \ \ | | | | | | | | | Update counter cache when pushing into association | |||||
| | * | | | Update counter cache when pushing into association | Matthew Robertson | 2013-04-21 | 3 | -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_response | Andrew White | 2013-04-22 | 1 | -1/+2 | |
| |\ \ \ \ | |_|/ / |/| | | | extract no content response codes to a constant | |||||
| | * | | | extract no content response codes to a constant | Vipul A M | 2013-04-22 | 1 | -1/+2 | |
| | | | | | ||||||
| * | | | | Move CHANGELOG entry to top | Rafael Mendonça França | 2013-04-22 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | Merge pull request #10096 from benofsky/fix_skipping_object_callback_filters | Rafael Mendonça França | 2013-04-21 | 3 | -2/+43 | |
| |\ \ \ \ | |/ / / |/| | | | Fixes skipping object callback filters | |||||
| | * | | | Fixes skipping object callback filters | Ben McRedmond | 2013-04-04 | 3 | -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_callback | Rafael Mendonça França | 2013-04-21 | 1 | -1/+3 | |
| |\ \ \ \ | |_|/ / |/| | | | extract array to a constant | |||||
| | * | | | extract array to a constant | Vipul A M | 2013-04-22 | 1 | -1/+3 | |
| |/ / / | ||||||
| * | | | Merge pull request #10290 from buddhamagnet/master | Santiago Pastorino | 2013-04-21 | 1 | -1/+3 | |
| |\ \ \ | | | | | | | | | Extract path into variable | |||||
| | * | | | extract path into variable | buddhamagnet | 2013-04-21 | 1 | -1/+3 | |
| |/ / / | ||||||
| * | | | Merge pull request #10289 from maratvmk/readme | Santiago Pastorino | 2013-04-21 | 1 | -2/+2 | |
| |\ \ \ | | | | | | | | | fix README links in the main README.md | |||||
| | * | | | fix README links in the main README.md | Marat Kazbekov | 2013-04-22 | 1 | -2/+2 | |
| |/ / / | ||||||
| * | | | Merge pull request #10286 from ↵ | Carlos Antonio da Silva | 2013-04-21 | 1 | -2/+2 | |
| |\ \ \ | | | | | | | | | | | | | | | | | neerajdotname/fix-wrong-test-name-and-failure-message fix wrong test description and failure message | |||||
| | * | | | fix wrong test description and failure message | Neeraj Singh | 2013-04-21 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Merge pull request #10284 from neerajdotname/missing-active-model-tests | Guillermo Iguaran | 2013-04-21 | 1 | -0/+21 | |
| |\ \ \ \ | | | | | | | | | | | Added tests for if condition in Active Model callbacks | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |