aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10519 from eiel/dependency-core_ext-hash-diffRafael Mendonça França2013-05-081-0/+2
|\ | | | | dependency ActiveSupport::Deprecation
| * dependency ActiveSupport::DeprecationTomohiko Himura2013-05-091-0/+2
|/
* Merge pull request #10511 from prathamesh-sonpatki/existentJosé Valim2013-05-073-4/+4
|\ | | | | Fix Typo existant -> existent [ci skip]
| * Fix Typo existant -> existent [ci skip]Prathamesh Sonpatki2013-05-083-4/+4
|/
* Merge pull request #9522 from wangjohn/automatic_search_for_association_inversesJeremy Kemper2013-05-0711-10/+194
|\ | | | | Finding inverse associations automatically
| * Created a method to automatically find inverse associations and cachewangjohn2013-05-0711-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-filterAaron Patterson2013-05-073-1/+28
|\ | | | | fix issue #10502, do not recompute method name for already-stringified object callback filter
| * add changelog entry for fix-10502-skip-object-filterSean Walbran2013-05-071-0/+5
| |
| * fix issue #10502, do not recompute method name for already-stringified ↵Sean Walbran2013-05-072-1/+23
| | | | | | | | object filter
* | Revert "Merge pull request #10455 from ↵Aaron Patterson2013-05-072-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_pkAaron Patterson2013-05-072-2/+35
|\ | | | | Add PK constraint on bigserial ID columns on postgres adapter
| * Handle other pk types in PostgreSQL gracefully.Patrick Robertson2013-05-072-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 arrayBrandon Keepers2013-05-071-2/+19
|/ | | | https://github.com/rails/etagger/pull/3
* Merge pull request #10234 from dasch/dasch/fetch-multiRafael Mendonça França2013-05-063-1/+61
|\ | | | | Allow fetching multiple values from the cache at once
| * Allow fetching multiple values from the cache at onceDaniel Schierbeck2013-05-063-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_numberRafael Mendonça França2013-05-064-3/+12
|\ \ | | | | | | Allow numbers in partial name for digesting
| * | Allow numbers in partial name for digestingBryan Ricker2013-05-064-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-compilationRafael Mendonça França2013-05-061-2/+9
|\ \ \ | |/ / |/| | Instrument template compilation
| * | Instrument template compilationDaniel Schierbeck2013-05-061-2/+9
| |/
* | Improve CHANGELOG entry [ci skip]Rafael Mendonça França2013-05-061-4/+4
| |
* | Merge pull request #10489 from greenriver/ar_counter_cache_multiple_destroyRafael Mendonça França2013-05-063-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 decrementingBen Tucker2013-05-063-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-1Rafael Mendonça França2013-05-061-1/+1
|\ \ \ | | | | | | | | use canonical #controller_path logic in controller test cases
| * | | use canonical #controller_path logic in controller test casesLance Ivy2013-05-051-1/+1
| | | |
* | | | Fix test asserting the sanitized SQL hash differently to some adaptersRafael Mendonça França2013-05-061-1/+7
| | | |
* | | | Merge pull request #10352 from ↵Rafael Mendonça França2013-05-063-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_conditionsZach Ohlgren2013-05-063-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing CHANGLOG description Remove extra line. Remove blank lines.
* | | | | Merge pull request #10488 from neerajdotname/10419-bRafael Mendonça França2013-05-061-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | fix failing test caused by 3771e4d511
| * | | | fix failing test caused by 3771e4d511Neeraj Singh2013-05-061-2/+2
| | | | |
* | | | | let rake tasks be robust to a missing RDoc in Rubinius [Fixes #10462]Xavier Noria2013-05-061-45/+56
| | | | | | | | | | | | | | | | | | | | See the comment in the rescue clause towards the top of the patch for the rationale.
* | | | | Merge pull request #10437 from neerajdotname/10419Rafael Mendonça França2013-05-063-1/+49
|\| | | | | | | | | | | | | | raise IrreversibleMigration if no column given
| * | | | raise IrreversibleMigration if no column givenNeeraj Singh2013-05-063-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_variableRafael Mendonça França2013-05-061-1/+0
|\ \ \ \ | | | | | | | | | | remove unused variable
| * | | | remove unused variableVipul A M2013-05-061-1/+0
|/ / / /
* | | | Merge pull request #10453 from vipulnsward/destructive_sortJeremy Kemper2013-05-051-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 M2013-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | Check https://gist.github.com/vipulnsward/6aad158c06a22f931a71 to see the gains.
* | | | | Merge pull request #10480 from juno/fix-typoSteve Klabnik2013-05-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix typo in documentation comment [ci skip]
| * | | | | Fix typo in documentation commentJunya Ogura2013-05-061-1/+1
|/ / / / /
* | | | | Merge pull request #10467 from ↵Rafael Mendonça França2013-05-051-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | akalyaev/set-correct-backend-for-nokogirisax-engine use nokogirisax as a backend
| * | | | | use nokogirisax as a backendAnton Kalyaev2013-05-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most likely someone just forgot to change it during copying and pasting test cases from nokigiri engine test.
* | | | | | Merge pull request #10476 from prathamesh-sonpatki/gitignoreRafael Mendonça França2013-05-053-3/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Updated link to to GitHub article about ignoring files [ci skip]
| * | | | | Updated link to to GitHub article about ignoring files [ci skip]Prathamesh Sonpatki2013-05-053-3/+3
|/ / / / / | | | | | | | | | | | | | | | - http://help.github.com/ignore-files redirects to https://help.github.com/articles/ignoring-files
* | | | | Merge pull request #10466 from prathamesh-sonpatki/scaffold-assetsCarlos Antonio da Silva2013-05-051-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix tests related to scaffolding generator with --assets=false switch
| * | | | | Fixes warning 'method redefined' in scaffold generators testsPrathamesh Sonpatki2013-05-051-4/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - f1805a697831 Redefined 'test_scaffold_generator_no_assets' twice. - Only the last instance of these three definitions of the same method was getting called when the tests were actually running. - This commit changes names of this method so that all three definitions will be called - scaffold.css is not generated by --assets=false switch. - Test was expecting the presence of the file with --assets=false - This issue was not discovered in f1805a697831b because it was redefining the same method twice
* | | | | Merge pull request #10468 from ↵Carlos Antonio da Silva2013-05-051-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | rimidl/add-missing-require-to-actionview-lookupcontext Added missing `require` to ActionView::LookupContext
| * | | | | Added missing `require` to ActionView::LookupContextVladimir Strakhov2013-05-051-0/+1
| |/ / / /
* | | | | Merge pull request #10472 from prathamesh-sonpatki/githubCarlos Antonio da Silva2013-05-054-14/+14
|\ \ \ \ \ | |/ / / / |/| | | | Github -> GitHub [ci skip]
| * | | | Github -> GitHub [ci skip]Prathamesh Sonpatki2013-05-054-14/+14
|/ / / /
* | | | Merge pull request #10465 from raphweiner/rake_install_depend_on_buildRafael Mendonça França2013-05-041-1/+1
| | | | | | | | | | | | | | | | Make rake install task depend on build instead of gem
* | | | Merge pull request #10464 from arkiver/masterRafael Mendonça França2013-05-042-2/+2
|\ \ \ \ | | | | | | | | | | Fix to remove warning in postgres adapter test
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 09:03:31 +0000