aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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>
* | | | | | AlignmentDavid Heinemeier Hansson2013-04-181-1/+1
|/ / / / /
* | | | | Indent around the scaffold loopDavid Heinemeier Hansson2013-04-181-8/+8
| | | | |
* | | | | HTML5 breaksDavid Heinemeier Hansson2013-04-182-4/+4
| | | | |
* | | | | Better orderingDavid Heinemeier Hansson2013-04-181-3/+3
| | | | |
* | | | | Revert "Merge pull request #10043 from cconstantine/master"Rafael Mendonça França2013-04-182-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 521035af530482d6d9ad2dae568eaeb0ab188e1c, reversing changes made to 222011dbee842bbc60d3aaaa3145356b90a30fd1. Reason: This broke the tests
* | | | | Use sprockets-rails 2.0.0.rc4Guillermo Iguaran2013-04-181-1/+1
| | | | |
* | | | | Use sass-rails 4.0.0.rc1Rafael Mendonça França2013-04-181-1/+1
| | | | |
* | | | | Use the same uglifier version that the generated applicationsRafael Mendonça França2013-04-181-1/+1
| | | | |
* | | | | Use latest coffee-rails releaseRafael Mendonça França2013-04-182-2/+2
| | | | |
* | | | | Revert "sprockets 2.9.x doesn't work with uglifier 2.0 yet."Rafael Mendonça França2013-04-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 575838795019f7402992e3bfa83a0c5048cf143d. Conflicts: railties/lib/rails/generators/app_base.rb Reason: sprockets 2.9.1 fixes this issue
* | | | | Bump arel to 4.0.0Rafael Mendonça França2013-04-181-1/+1
| | | | |
* | | | | Merge pull request #10043 from cconstantine/masterRafael Mendonça França2013-04-182-0/+21
|\ \ \ \ \ | | | | | | | | | | | | DB with postgres string array column doesn't load fixtures well
| * | | | | Fix loading of string arrays in postgresChris Constantine2013-04-082-0/+21
| | | | | |
* | | | | | Add CHANGELOG entries - closes #10180, #10185Andrew White2013-04-181-0/+10
| | | | | |
* | | | | | Refactor ActionDispatch::Http::URL.build_host_urlAndrew White2013-04-182-20/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for extracting the port from the :host option and for removing the subdomain by using nil, false or ''.
* | | | | | Add url generation tests for #10185Andrew White2013-04-181-0/+2
| | | | | |
* | | | | | Duplicate options before mutating themAndrew White2013-04-182-3/+5
| | | | | |
* | | | | | Passing subdomain: '' to url_for removes the subdomain (instead of adding a ↵Derek Watson2013-04-184-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | leading .) Adding a boolean route constraint checks for presence/absence of request property
* | | | | | Merge pull request #10262 from printercu/patch-3Rafael Mendonça França2013-04-182-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Avoid leak into controller's action_methods
| * | | | | | Avoid leak into controller's action_methodsprintercu2013-04-182-0/+7
|/ / / / / /
* | | | | | Merge pull request #10258 from thenickcox/pending_migrations_pluralRafael Mendonça França2013-04-181-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix subject-verb agreement in error msg (and other grammar stuff)
| * | | | | | Fix subject-verb agreement in error msg (and other grammar stuff)thenickcox2013-04-171-3/+3
| | | | | | |
* | | | | | | Merge pull request #10259 from prathamesh-sonpatki/secure-engine-testsCarlos Antonio da Silva2013-04-171-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use secure source for rubygems in engine tests
| * | | | | | | Use secure source for rubygems in engine testsPrathamesh Sonpatki2013-04-181-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #10255 from ↵Carlos Antonio da Silva2013-04-171-18/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wangjohn/increment_or_decrement_refactoring_in_local_cache Refactoring increment and decrement in local cache
| * | | | | | | The increment and decrement commands in the local cache are exactly thewangjohn2013-04-171-18/+14
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | same, so their logic is being refactored.
* | | | | | | Merge pull request #10254 from wangjohn/refactoring_local_cacheCarlos Antonio da Silva2013-04-171-8/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Refactored the storage of a temporary version of the local cache.
| * | | | | | | Refactored the storage of a temporary version of the local cache intowangjohn2013-04-171-8/+6
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | its own method.
* | | | | | | activerecord-deprecated_finders 1.0.0 has a bug with has_many :throughRafael Mendonça França2013-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | associations
* | | | | | | Merge pull request #10252 from epiclabs/nodoc_registriesRafael Mendonça França2013-04-172-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | add :nodoc: mark to *Registry classes [ci skip]
| * | | | | | | add :nodoc: mark to *Registry classes [ci skip]Francesco Rodriguez2013-04-173-5/+5
| | | | | | | |
* | | | | | | | Add nodoc to LocalCacheRegistryRafael Mendonça França2013-04-171-1/+1
|/ / / / / / / | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge pull request #10250 from wangjohn/local_cache_registryRafael Mendonça França2013-04-171-15/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Adding a local thread registry to store local caches.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-31 23:18:07 +0000