aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use Travis https build status image in order to prevent GitHub fromVijay Dev2011-09-082-3/+5
| | | | | | | | caching the http version. The syntax for including an https image url in RDoc taken from http://about.travis-ci.org/docs/user/status-images. Having this in a line of its own now to make regex replacement for the API simpler!
* fixing view queriesAaron Patterson2011-09-071-3/+5
|
* use the supplied bind valuesAaron Patterson2011-09-071-1/+1
|
* Merge commit 'refs/pull/2909/head' of https://github.com/rails/rails into rawrAaron Patterson2011-09-072-6/+10
| | | | | | * https://github.com/rails/rails: Postgresql adapter: added current_schema check for table_exists? Postgresql adapter: added current_schema check for table_exists?
* Merge pull request #2914 from yahonda/add_rownum_to_test_first_and_lastJon Leighton2011-09-071-2/+2
|\ | | | | Add ROWNUM to test first and last to support Oracle.
| * Add ROWNUM to test first and last to support Oracle.Yasuo Honda2011-09-071-2/+2
| |
* | Merge pull request #2904 from guilleiguaran/refactor-assets-testsSantiago Pastorino2011-09-071-13/+14
|\ \ | | | | | | Refactor assets tests to use add_to_config
| * | Refactor assets tests to use add_to_config instead of creating initializers ↵Guillermo Iguaran2011-09-061-13/+14
| | | | | | | | | | | | with config values
* | | Merge pull request #2499 from akaspick/assert_select_email_fixJon Leighton2011-09-072-2/+21
|\ \ \ | | | | | | | | Fix assert_select_email to work on non-multipart emails as well as converting the Mail::Body to a string to prevent errors.
| * | | fix assert_select_email to work on non-multipart emails as well as ↵Andrew Kaspick2011-08-112-2/+21
| | | | | | | | | | | | | | | | converting the Mail::Body to a string to prevent errors.
* | | | Merge pull request #2911 from toolmantim/patch-1Jon Leighton2011-09-071-1/+1
|\ \ \ \ | |_|_|/ |/| | | Make sure require_tzinfo only calls Kernel#require if TZInfo isn't alread
| * | | Make sure require_tzinfo only calls Kernel#require if TZInfo isn't already ↵Tim Lucas2011-09-071-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | present. This wasn't a problem when require_tzinfo was only called from TimeZone#initialize, but now it's being called for every lookup to TimeZone.[] (via lazy_zones_map) TimeZone lookup can occur when unmarshalling TimeWithZone objects, which is where I first saw the big slowdown (500ms for each Rails action that loaded from Rails.cache)
* | | Merge pull request #2905 from nhocki/patch-1Vijay Dev2011-09-071-1/+1
|\ \ \ | | | | | | | | Fixing small typo in the `record_key_for_dom_id` documentation.
| * | | Nicolás Hock Isaza2011-09-061-1/+1
| | |/ | |/| | | | | | | | | | Fixing `record_key_for_dom_id` documentation. The default implementation joins everything with '_' and not with '-'
* | | Don't include any of includes, preload, joins, eager_load in the through ↵Jon Leighton2011-09-072-4/+6
| | | | | | | | | | | | association scope.
* | | Merge pull request #2485 from akaspick/exists_fixJon Leighton2011-09-072-1/+12
|\ \ \ | |/ / |/| | fix exists? to return false if passed nil (which may come from a missing
| * | fix exists? to return false if passed nil (which may come from a missing URL ↵Andrew Kaspick2011-08-102-1/+12
| | | | | | | | | | | | param)
* | | Merge pull request #2897 from rsutphin/ar31-remove_connectionAaron Patterson2011-09-063-3/+22
| | | | | | | | | | | | Patch for issue #2820
* | | Eliminate newlines in basic auth. fixes #2882Aaron Patterson2011-09-062-1/+9
| | |
* | | Database adapters use a statement pool.Aaron Patterson2011-09-063-8/+46
| | | | | | | | | | | | | | | | | | Database adapters use a statement pool for limiting the number of open prepared statments on the database. The limit defaults to 1000, but can be adjusted in your database config by changing 'statement_limit'.
* | | adding a statement pool for mysql and sqlite3Aaron Patterson2011-09-063-9/+102
| | |
* | | Merge pull request #2893 from dmathieu/errors_has_keyAaron Patterson2011-09-062-0/+7
|\ \ \ | | | | | | | | add has_key? to ActiveModel::Errors
| * | | add has_key? to ActiveModel::ErrorsDamien Mathieu2011-09-062-0/+7
|/ / /
* | | Merge pull request #2577 from rails-noob/masterSantiago Pastorino2011-09-062-1/+51
|\ \ \ | | | | | | | | Fix double slash at start of paths when mounting an engine at the root.
| * | | Fix bug #2579.rails-noob2011-09-062-1/+51
| | | | | | | | | | | | | | | | Avoids double slash at start of paths when mounting an engine at the root.
* | | | Merge pull request #2889 from guilleiguaran/perform-caching-assetsSantiago Pastorino2011-09-062-1/+10
|\ \ \ \ | | | | | | | | | | config.action_controller.perform_caching isn't used anymore in asset pipeline
| * | | | config.action_controller.perform_caching isn't used anymore in assets ↵Guillermo Iguaran2011-09-062-1/+10
| | | | | | | | | | | | | | | | | | | | pipeline, instead we are using config.assets.digest now
* | | | | Nested through associations: preloads from the default scope of a through ↵Jon Leighton2011-09-062-1/+10
| | | | | | | | | | | | | | | | | | | | model should not be included in the association scope. (We're already excluding includes.) Fixes #2834.
* | | | | Ensure we are not comparing a string with a symbol in ↵Jon Leighton2011-09-063-2/+12
| | | | | | | | | | | | | | | | | | | | HasManyAssociation#inverse_updates_counter_cache?. Fixes #2755, where a counter cache could be decremented twice as far as it was supposed to be.
* | | | | Make the logic easier to readJon Leighton2011-09-061-4/+7
| | | | |
* | | | | Disable active record marshalling tests on Ruby 1.8.7 on Travis CI, as they ↵Jon Leighton2011-09-062-0/+25
| | | | | | | | | | | | | | | | | | | | have been failing intermittently for a long while due to what appears to be a Ruby bug. If anyone has the skills/expertise/time to debug this, please speak to the Travis guys.
* | | | | Merge pull request #2883 from dmathieu/fix_testJon Leighton2011-09-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | #first doesn't take an order in this test
| * | | | | #first doesn't take an order in this testDamien Mathieu2011-09-061-1/+1
| | | | | |
* | | | | | Merge pull request #2851 from dasch/patch-6Jon Leighton2011-09-061-5/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | No need to use a begin block there
| * | | | | No need to use a begin block thereDaniel Schierbeck2011-09-041-5/+3
| | | | | |
* | | | | | Bump uglifier upSantiago Pastorino2011-09-051-1/+1
| | | | | |
* | | | | | Merge pull request #2870 from arunagw/uglifier_bumpSantiago Pastorino2011-09-051-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Uglifier bump
| * | | | | | Uglifier bumpArun Agrawal2011-09-051-1/+1
| | | | | | |
* | | | | | | Merge pull request #2877 from dmathieu/fix_tests_pg_18Santiago Pastorino2011-09-051-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Last orders the records by id
| * | | | | | | first and last orders the records by idDamien Mathieu2011-09-061-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #2716 from jbbarth/fix_invert_rename_indexAaron Patterson2011-09-052-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix bad options order in AR::Migration::CommandRecorder#invert_rename_index
| * | | | | | | | Fixed bad options order in ↵jbbarth2011-08-282-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord::Migration::CommandRecorder#invert_rename_index
* | | | | | | | | Don't find belongs_to target when the foreign_key is NULL. Fixes #2828Georg Friedrich2011-09-052-0/+10
| | | | | | | | |
* | | | | | | | | Merge pull request #2873 from guilleiguaran/remove-unused-configSantiago Pastorino2011-09-051-3/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove unused config variable from test.rb template
| * | | | | | | | | Remove unused config variable from test.rb templateGuillermo Iguaran2011-09-051-3/+0
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2872 from sikachu/content_tag_html_safeSantiago Pastorino2011-09-052-1/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Make sure that result from content_tag_for with collection is html_safe
| * | | | | | | | | Make sure that result from content_tag_for with collection is html_safePrem Sichanugrist2011-09-052-1/+13
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | Thank you @spastorino for catching the empty test in b84cee0, as I totally forgot that I still have to make it html_safe.
* | | | | | | | | Merge pull request #2815 from avakhov/current-page-non-get-requestsSantiago Pastorino2011-09-052-2/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | current_page? returns false for non-GET requests
| * | | | | | | | | current_page? returns false for non-GET requestsAlexey Vakhov2011-09-022-2/+16
| | | | | | | | | |
* | | | | | | | | | Merge pull request #2799 from tomstuart/3-1-stableSantiago Pastorino2011-09-052-3/+39
| |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Never return stored content from content_for when a block is given
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 02:34:40 +0000