Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | if the callbacks are not the same class, they cannot be duplicates | Aaron Patterson | 2013-05-08 | 1 | -2/+6 |
| | |||||
* | fix object comparison case | Aaron Patterson | 2013-05-08 | 1 | -1/+5 |
| | |||||
* | polymorphic comparison operator | Aaron Patterson | 2013-05-08 | 1 | -11/+24 |
| | |||||
* | we need to indicate the type of callback | Aaron Patterson | 2013-05-08 | 1 | -2/+2 |
| | |||||
* | Merge pull request #10355 from burke/master | Jeremy Kemper | 2013-05-08 | 1 | -39/+19 |
|\ | | | | | Use Ruby's native Encoding functionality to implement `tidy_bytes` | ||||
| * | Use ruby's Encoding support for tidy_bytes | Burke Libbey | 2013-05-08 | 1 | -39/+19 |
| | | | | | | | | | | | | | | | | | | | | The previous implementation was quite slow. This leverages some of the transcoding abilities built into Ruby 1.9 instead. It is roughly 96% faster. The roundtrip through UTF_8_MAC here is because ruby won't let you transcode from UTF_8 to UTF_8. I chose the closest encoding I could find as an intermediate. | ||||
* | | Merge pull request #10521 from yahonda/sanitize_oracle | Rafael Mendonça França | 2013-05-08 | 1 | -5/+4 |
|\ \ | | | | | | | Remove current_adapter? from test_sanitize_sql_hash_handles_associations | ||||
| * | | Remove current_adapter? from test_sanitize_sql_hash_handles_associations | Yasuo Honda | 2013-05-08 | 1 | -5/+4 |
| | | | | | | | | | | | | | | | | | | | | | Because of each adapter implementation differences, `expected_value` string needed to be handled by each adapter. This commit removes current_adapter by using ActiveRecord::ConnectionAdapters::Quoting methods. | ||||
* | | | adding more tests around callback inconsistencies | Aaron Patterson | 2013-05-08 | 1 | -5/+47 |
| | | | |||||
* | | | refactor tests for more points | Aaron Patterson | 2013-05-08 | 1 | -4/+5 |
| | | | |||||
* | | | adding test to demonstrate inconsistencies in the AS::Callbacks api | Aaron Patterson | 2013-05-08 | 1 | -0/+41 |
| |/ |/| | |||||
* | | Merge pull request #10519 from eiel/dependency-core_ext-hash-diff | Rafael Mendonça França | 2013-05-08 | 1 | -0/+2 |
|\ \ | | | | | | | dependency ActiveSupport::Deprecation | ||||
| * | | dependency ActiveSupport::Deprecation | Tomohiko Himura | 2013-05-09 | 1 | -0/+2 |
|/ / | |||||
* | | Merge pull request #10511 from prathamesh-sonpatki/existent | José Valim | 2013-05-07 | 3 | -4/+4 |
|\ \ | | | | | | | Fix Typo existant -> existent [ci skip] | ||||
| * | | Fix Typo existant -> existent [ci skip] | Prathamesh Sonpatki | 2013-05-08 | 3 | -4/+4 |
|/ / | |||||
* | | Merge pull request #9522 from wangjohn/automatic_search_for_association_inverses | Jeremy Kemper | 2013-05-07 | 11 | -10/+194 |
|\ \ | | | | | | | Finding inverse associations automatically | ||||
| * | | Created a method to automatically find inverse associations and cache | wangjohn | 2013-05-07 | 11 | -10/+194 |
|/ / | | | | | | | | | | | the results. Added tests to check to make sure that inverse associations are automatically found when has_many, has_one, or belongs_to associations are defined. | ||||
* | | Merge pull request #10506 from seanwalbran/fix-10502-skip-object-filter | Aaron Patterson | 2013-05-07 | 3 | -1/+28 |
|\ \ | | | | | | | fix issue #10502, do not recompute method name for already-stringified object callback filter | ||||
| * | | add changelog entry for fix-10502-skip-object-filter | Sean Walbran | 2013-05-07 | 1 | -0/+5 |
| | | | |||||
| * | | fix issue #10502, do not recompute method name for already-stringified ↵ | Sean Walbran | 2013-05-07 | 2 | -1/+23 |
| | | | | | | | | | | | | object filter | ||||
* | | | Revert "Merge pull request #10455 from ↵ | Aaron Patterson | 2013-05-07 | 2 | -35/+2 |
|/ / | | | | | | | | | | | | | patricksrobertson/bigserial_id_not_identifying_pk" This reverts commit 3043d45eefc3776d5f3a9e7d212a01f99d869ef8, reversing changes made to ca0275d36b395631725c4583db5a45c06443fdb9. | ||||
* | | Merge pull request #10455 from patricksrobertson/bigserial_id_not_identifying_pk | Aaron Patterson | 2013-05-07 | 2 | -2/+35 |
|\ \ | |/ |/| | Add PK constraint on bigserial ID columns on postgres adapter | ||||
| * | Handle other pk types in PostgreSQL gracefully. | Patrick Robertson | 2013-05-07 | 2 | -2/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | In #10410 it was noted that you can no longer create PK's with the type of bigserial in PostgreSQL in 4.0.0.rc1. This is mostly because the newer adapter is checking for column type with the id column instead of just letting it pass through like it did before. Side effects: You may just create a PK column of a type that you really don't want to be your PK. As far as I can tell this was allowed in 3.2.X and perhaps an exception should be raised if you try and do something extremely dumb. | ||||
* | | Test that #fresh_when accepts an array | Brandon Keepers | 2013-05-07 | 1 | -2/+19 |
|/ | | | | https://github.com/rails/etagger/pull/3 | ||||
* | Merge pull request #10234 from dasch/dasch/fetch-multi | Rafael Mendonça França | 2013-05-06 | 3 | -1/+61 |
|\ | | | | | Allow fetching multiple values from the cache at once | ||||
| * | Allow fetching multiple values from the cache at once | Daniel Schierbeck | 2013-05-06 | 3 | -1/+61 |
| | | | | | | | | | | Add a simple API for fetching a list of entries from the cache, where any missing entries are computed by a supplied block. | ||||
* | | Merge pull request #10377 from bricker/template_digest_ending_with_number | Rafael Mendonça França | 2013-05-06 | 4 | -3/+12 |
|\ \ | | | | | | | Allow numbers in partial name for digesting | ||||
| * | | Allow numbers in partial name for digesting | Bryan Ricker | 2013-05-06 | 4 | -3/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add failing test for template with number at the end Use \w for RENDER_DEPENDENCY regex Spacing Add CHANGELOG entry | ||||
* | | | Merge pull request #10446 from dasch/instrument-template-compilation | Rafael Mendonça França | 2013-05-06 | 1 | -2/+9 |
|\ \ \ | |/ / |/| | | Instrument template compilation | ||||
| * | | Instrument template compilation | Daniel Schierbeck | 2013-05-06 | 1 | -2/+9 |
| |/ | |||||
* | | Improve CHANGELOG entry [ci skip] | Rafael Mendonça França | 2013-05-06 | 1 | -4/+4 |
| | | |||||
* | | Merge pull request #10489 from greenriver/ar_counter_cache_multiple_destroy | Rafael Mendonça França | 2013-05-06 | 3 | -2/+28 |
|\ \ | | | | | | | | | | | | | | | | | | | Confirm a record has not already been destroyed before decrementing counter cache Conflicts: activerecord/CHANGELOG.md | ||||
| * | | Confirm a record has not already been destroyed before decrementing | Ben Tucker | 2013-05-06 | 3 | -1/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | counter cache At present, calling destroy multiple times on the same record results in the belongs_to counter cache being decremented multiple times. With this change the record is checked for whether it is already destroyed prior to decrementing the counter cache. | ||||
* | | | Merge pull request #10478 from cainlevy/patch-1 | Rafael Mendonça França | 2013-05-06 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | use canonical #controller_path logic in controller test cases | ||||
| * | | | use canonical #controller_path logic in controller test cases | Lance Ivy | 2013-05-05 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix test asserting the sanitized SQL hash differently to some adapters | Rafael Mendonça França | 2013-05-06 | 1 | -1/+7 |
| | | | | |||||
* | | | | Merge pull request #10352 from ↵ | Rafael Mendonça França | 2013-05-06 | 3 | -4/+15 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | zohlgren/fix_activerecord_sanitization_sanitize_sql_hash Fix bug in ActiveRecord::Sanitization#sanitize_sql_hash_for_conditions | ||||
| * | | | | Fix bug in ActiveRecord::Sanitization#sanitize_sql_hash_for_conditions | Zach Ohlgren | 2013-05-06 | 3 | -4/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing CHANGLOG description Remove extra line. Remove blank lines. | ||||
* | | | | | Merge pull request #10488 from neerajdotname/10419-b | Rafael Mendonça França | 2013-05-06 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | fix failing test caused by 3771e4d511 | ||||
| * | | | | fix failing test caused by 3771e4d511 | Neeraj Singh | 2013-05-06 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | let rake tasks be robust to a missing RDoc in Rubinius [Fixes #10462] | Xavier Noria | 2013-05-06 | 1 | -45/+56 |
| | | | | | | | | | | | | | | | | | | | | See the comment in the rescue clause towards the top of the patch for the rationale. | ||||
* | | | | | Merge pull request #10437 from neerajdotname/10419 | Rafael Mendonça França | 2013-05-06 | 3 | -1/+49 |
|\| | | | | | | | | | | | | | | raise IrreversibleMigration if no column given | ||||
| * | | | | raise IrreversibleMigration if no column given | Neeraj Singh | 2013-05-06 | 3 | -1/+49 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #10419 Following code should raise IrreversibleMigration. But the code was failing since options is an array and not a hash. def change change_table :users do |t| t.remove_index [:name, :email] end end Fix was to check if the options is a Hash before operating on it. | ||||
* | | | | Merge pull request #10486 from vipulnsward/remove_variable | Rafael Mendonça França | 2013-05-06 | 1 | -1/+0 |
|\ \ \ \ | | | | | | | | | | | remove unused variable | ||||
| * | | | | remove unused variable | Vipul A M | 2013-05-06 | 1 | -1/+0 |
|/ / / / | |||||
* | | | | Merge pull request #10453 from vipulnsward/destructive_sort | Jeremy Kemper | 2013-05-05 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Speed up Hash#to_param by switching from #sort to #sort! | ||||
| * | | | | use destructive sort on array in Hash#to_param for performance gains. | Vipul A M | 2013-05-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Check https://gist.github.com/vipulnsward/6aad158c06a22f931a71 to see the gains. | ||||
* | | | | | Merge pull request #10480 from juno/fix-typo | Steve Klabnik | 2013-05-05 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix typo in documentation comment [ci skip] | ||||
| * | | | | | Fix typo in documentation comment | Junya Ogura | 2013-05-06 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #10467 from ↵ | Rafael Mendonça França | 2013-05-05 | 1 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | akalyaev/set-correct-backend-for-nokogirisax-engine use nokogirisax as a backend |