aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
|/ /
* | Merge pull request #10211 from neerajdotname/4208Rafael Mendonça França2013-04-193-1/+41
|\ \ | | | | | | fix respond_to? for non selected column
| * | fix respond_to? for non selected columnNeeraj Singh2013-04-193-1/+41
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #4208 If a query selects only a few columns and gives custom names to those columns then respond_to? was returning true for the non selected columns. However calling those non selected columns raises exception. post = Post.select("'title' as post_title").first In the above case when `post.body` is invoked then an exception is raised since `body` attribute is not selected. Howevere `respond_to?` did not behave correctly. pos.respond_to?(:body) #=> true Reason was that Active Record calls `super` to pass the call to Active Model and all the columns are defined on Active Model. Fix is to actually check if the data returned from the db contains the data for column in question.
* | Merge pull request #10267 from vipulnsward/use_destructive_methodRafael Mendonça França2013-04-192-2/+2
|\ \ | | | | | | symbolize_keys => symbolize_keys! on new hash; change sentence
| * | symbolize_keys => symbolize_keys! on new hash;Vipul A M2013-04-192-2/+2
| | | | | | | | | | | | "There're" => There are for better readability
* | | Merge pull request #10265 from wangjohn/documenting_actionviewRafael Mendonça França2013-04-194-0/+41
|\ \ \ | | | | | | | | Adding documentation to Renderer
| * | | Adding documentation to actionview so that the big picture of thewangjohn2013-04-184-0/+41
| | | | | | | | | | | | | | | | renderer is clearer.
* | | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2013-04-199-15/+66
|\ \ \ \
| * | | | Revert "Merge pull request #10183 from jholton/fix_association_auto_save"Jon Leighton2013-04-193-29/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e8727d37fc49d5bf9976c3cb5c46badb92cf4ced, reversing changes made to d098e1c24bc145e0cc14532348436e14dc46d375. Reason: it broke the mysql build
| * | | | Merge pull request #10183 from jholton/fix_association_auto_saveJon Leighton2013-04-193-9/+29
| |\ \ \ \ | | | | | | | | | | | | autosave_association issue that occurs when table has unique index
| | * | | | destroys association records before saving/inserting new association recordsJohnny Holton2013-04-193-9/+29
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes bug introduced by #3329 These are the conditions necessary to reproduce the bug: - For an association, autosave => true. - An association record is being destroyed - A new association record is being created. - There is a unique index one of the association's fields. - The record being created has the same value as the record being destroyed on the indexed field. Before, the deletion of records was postponed until after all insertions/saves. Therefore the new record with the identical value in the indexed field caused a non-unique value error to be thrown at the database level. With this fix, the deletions happen first, before the insertions/saves. Therefore the record with the duplicate value is gone from the database before the new record is created, thereby avoiding the non-uniuqe value error.
| * | | | Merge pull request #10264 from cconstantine/masterRafael Mendonça França2013-04-192-1/+7
| |\ \ \ \ | | | | | | | | | | | | Postgresql array columns don't properly escape single quote strings when loading fixtures
| | * | | | Fix loading of fixtures when the column type is a postgres array of strings.Chris Constantine2013-04-182-1/+7
| | |/ / / | | | | | | | | | | | | | | | - A string in an array of strings that has a quote char (') needs to have that quote char escaped if the array is getting wrapped in quote chars.
| * | | | Improve the error messageRafael Mendonça França2013-04-192-2/+2
| | | | |
| * | | | Merge pull request #10217 from mirasrael/make-migrator-run-transactional-4.0Rafael Mendonça França2013-04-193-5/+42
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support transactions in Migrator.run Conflicts: activerecord/CHANGELOG.md
| | * | | | Support transactions in Migrator.runbondarev2013-04-183-5/+42
| | | | | |
| * | | | | Merge pull request #10200 from ↵Jon Leighton2013-04-192-2/+11
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | calebthompson/ct-fix-freeze-freezing-cloned-models Fix freeze applying to cloned objects
| | * | | | Fix freeze applying to cloned objectsCaleb Thompson2013-04-152-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, freezing a cloned ActiveRecord object froze the original too. By cloning `@attributes` before freezing, we prevent cloned objects (which in Ruby share state of ivars) from being effected by `#freeze`. Resolves issue #4936, which has further information on this issue, as well as steps to reproduce. * Add a test case for `#freeze` not causing `cloned.frozen?` to be true. * Clone @attributes before freezing in `ActiveRecord::Core`, then reassign the cloned, frozen hash to the frozen model's `@attributes` ivar. /cc @steveklabnik
| * | | | | Merge pull request #10235 from joergleis/patch-1Michael Koziarski2013-04-181-5/+4
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | Reorganize MessageEncryptor
| | * | | | Reorganize MessageEncryptorjgls2013-04-191-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) According to OpenSSL's documentation, cipher.random_iv must be called after cipher.encrypt and already sets the generated IV on the cipher. 2) OpenSSL::CipherError was moved to OpenSSL::Cipher::CipherError in Ruby 1.8.7. Since Rails 4 requires at least Ruby 1.9.3, support for the old location can be dropped.
| * | | | | Unindent attributes iteration in scaffold index templateCarlos Antonio da Silva2013-04-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we get extra indent for the <td> elements due to the extra spaces at the beginning of the lines, like this: <tr> <td><%= author.name %></td> <td><%= link_to 'Show', author %></td> <td><%= link_to 'Edit', edit_author_path(author) %></td>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 22:50:33 +0000