Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6398 from pmahoney/threadsafe-connection-pool | Aaron Patterson | 2012-05-19 | 1 | -4/+8 |
| | | | | Synchronize read and modification of @reserved_connections | ||||
* | Ensure that CollectionAssociation#replace returns proper target | Piotr Sarnacki | 2012-05-19 | 2 | -3/+3 |
| | | | | | | | | The fix commited in e2a070c was returning the `new_target`, as a try to return whatever user replaced association with. The problem is, the resulting association target may be ordered differently. In such case we want to return the target that will be later used for that association. | ||||
* | Merge pull request #5020 from KL-7/fix-blank-image_tag-source | José Valim | 2012-05-18 | 2 | -2/+3 |
| | | | | Render img tag with empty src if empty string is passed to image_tag. | ||||
* | Merge pull request #6390 from ernie/invalid-ruby18-syntax-in-habtm | Rafael Mendonça França | 2012-05-18 | 1 | -2/+2 |
|\ | | | | | Invalid ruby18 syntax in habtm | ||||
| * | Fix HABTM syntax error in Ruby 1.8.x | Ernie Miller | 2012-05-18 | 1 | -2/+2 |
|/ | |||||
* | fix #delete_all with habtm with :delete_sql | Jon Leighton | 2012-05-18 | 2 | -0/+7 |
| | |||||
* | Perf: Don't load the association for #delete_all. | Jon Leighton | 2012-05-18 | 6 | -9/+48 |
| | | | | | | | | Bug #6289 Conflicts: activerecord/test/cases/associations/has_many_associations_test.rb | ||||
* | Merge pull request #6377 from ihid/depreciate_old_text_helper_apis | Rafael Mendonça França | 2012-05-18 | 3 | -36/+56 |
|\ | | | | | Deprecate old APIs for highlight, excerpt and word_wrap | ||||
| * | Deprecate old APIs for highlight, excerpt and word_wrap | Jeremy Walker | 2012-05-18 | 3 | -36/+56 |
|/ | |||||
* | Merge pull request #6367 from frodsan/fix_validators_docs | Vijay Dev | 2012-05-17 | 9 | -116/+154 |
|\ | | | | | Fix validators docs [3-2-stable] | ||||
| * | fix validations docs | Francesco Rodriguez | 2012-05-17 | 9 | -116/+154 |
|/ | |||||
* | Fix CollectionAssociation#replace to return new target (closes #6231) | Piotr Sarnacki | 2012-05-16 | 2 | -0/+14 |
| | | | | | | Conflicts: activerecord/test/cases/associations/has_many_associations_test.rb | ||||
* | Merge pull request #6340 from bcardarella/patch-3 | Aaron Patterson | 2012-05-16 | 1 | -1/+1 |
|\ | | | | | Changing the indentation level of the block comment close for Sass | ||||
| * | Changing the indentation level of the block comment close for SASS | Brian Cardarella | 2012-05-15 | 1 | -1/+1 |
|/ | | | If one wants to use use SASS for application.css.sass the comment block indentation is invalid. | ||||
* | Merge pull request #6329 from acapilleri/backport_dup_validation_3_2 | Rafael Mendonça França | 2012-05-15 | 1 | -1/+9 |
|\ | | | | | Backport dup validation 3 2 | ||||
| * | add backport for the pull request #6324 | Angelo Capilleri | 2012-05-15 | 1 | -1/+9 |
|/ | |||||
* | Fix indent from previous merge | Carlos Antonio da Silva | 2012-05-15 | 1 | -2/+2 |
| | |||||
* | Merge pull request #6324 from acapilleri/dup_validation_3_2 | Rafael Mendonça França | 2012-05-15 | 2 | -0/+21 |
|\ | | | | | Dup validation 3 2 | ||||
| * | clean the errors if an object that includes validations errors is duped,for ↵ | Angelo capilleri | 2012-05-15 | 2 | -0/+21 |
|/ | | | | | | 3-2-stable It Fixes #5953 in 3-2-stable, it's the same pull request of #6284 | ||||
* | Merge pull request #6321 from frodsan/backport_docs | Vijay Dev | 2012-05-15 | 3 | -4/+23 |
|\ | | | | | Backporting docs | ||||
| * | Backporting some docs on core_ext/hash | Francesco Rodriguez | 2012-05-15 | 3 | -4/+23 |
|/ | |||||
* | Deprecate `:disable_with` for `button_tag` too | Carlos Galdino + Rafael Mendonça França | 2012-05-14 | 5 | -9/+20 |
| | |||||
* | Fix typo | Carlos Galdino + Rafael Mendonça França | 2012-05-14 | 3 | -10/+10 |
| | |||||
* | Deprecate `:disable_with` in favor of `'data-disable-with'` option for ↵ | Carlos Galdino + Rafael Mendonça França | 2012-05-14 | 5 | -31/+54 |
| | | | | `button_to` and `submit_tag` helpers. | ||||
* | Merge pull request #6018 from lest/patch-1 | Carlos Antonio da Silva | 2012-05-14 | 3 | -1/+16 |
| | | | | mailer can be anonymous | ||||
* | Default escape_html_entities_in_json to true in new apps | José Valim | 2012-05-14 | 1 | -2/+2 |
| | |||||
* | Update railties/lib/rails/generators/rails/app/templates/config/application.rb | Egor Homakov | 2012-05-14 | 1 | -0/+3 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Merge pull request #6266 from alexeymuranov/remove_unused_private_method | Carlos Antonio da Silva | 2012-05-13 | 1 | -3/+0 |
|\ | | | | | Remove unused private method | ||||
| * | Remove unused private method yaml_fixtures_key | Alexey Muranov | 2012-05-11 | 1 | -3/+0 |
| | | |||||
* | | Deprecate `:mouseover` options for `image_tag` helper. | Rafael Mendonça França | 2012-05-13 | 3 | -8/+44 |
| | | |||||
* | | Merge pull request #3237 from sakuro/data-url-scheme | Rafael Mendonça França | 2012-05-13 | 3 | -3/+4 |
| | | | | | | | | Support data: url scheme | ||||
* | | Merge pull request #6306 from erichmenge/3-2-stable-guide-fix | Carlos Antonio da Silva | 2012-05-13 | 1 | -2/+2 |
|\ \ | | | | | | | 3 2 stable guide fix [ci skip] | ||||
| * | | :foreign_key option should be on has_many side of association | Mikhail Dieterle | 2012-05-13 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #6299 from guilleiguaran/upgrade-sprockets-3-2-stable | Santiago Pastorino | 2012-05-13 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Upgrade sprockets to 2.1.3 | ||||
| * | | Upgrade sprockets to 2.1.3 | Guillermo Iguaran | 2012-05-13 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #6294 from frodsan/docs_backport | Vijay Dev | 2012-05-12 | 3 | -1/+22 |
|\ \ | | | | | | | Adding examples and docs [3-2-stable] | ||||
| * | | adding examples and docs | Francesco Rodriguez | 2012-05-12 | 3 | -1/+22 |
|/ / | |||||
* | | Merge pull request #6292 from erichmenge/3-2-stable-docfix | Rafael Mendonça França | 2012-05-12 | 1 | -1/+16 |
|\ \ | | | | | | | 3 2 stable guides fix | ||||
| * | | Update 'getting started' guides for new whitelist security implementation. ↵ | Erich Menge | 2012-05-12 | 1 | -1/+16 |
|/ / | | | | | | | Closes #6286. | ||||
* | | Merge pull request #6262 from arunagw/ruby_prof_fix | Santiago Pastorino | 2012-05-11 | 2 | -2/+2 |
|\ \ | |/ |/| | Ruby prof fix | ||||
| * | Ruby-Prof works with ruby-1.9.3 also. | Arun Agrawal | 2012-05-11 | 1 | -1/+1 |
| | | |||||
| * | Update performance profiler to work with latest ruby-prof | Arun Agrawal | 2012-05-11 | 2 | -2/+2 |
|/ | | | | Thanks to @carlosantoniodasilva | ||||
* | Return false for exists? with new records - fixes #6199. | Andrew White | 2012-05-10 | 3 | -2/+3 |
| | | | | (cherry picked from commit fa21b73ebb8339ad388f149c817c433b6254d490) | ||||
* | Don't ignore nil positional arguments for url helpers - fixes #6196. | Andrew White | 2012-05-10 | 2 | -1/+35 |
| | |||||
* | Refactor the handling of default_url_options in integration tests | Andrew White | 2012-05-10 | 2 | -7/+104 |
| | | | | | | | | | | | | This commit improves the handling of default_url_options in integration tests by making behave closer to how a real application operates. Specifically the following issues have been addressed: * Options specified in routes.rb are used (fixes #546) * Options specified in controllers are used * Request parameters are recalled correctly * Tests can override default_url_options directly | ||||
* | Merge pull request #6230 from spectator/active_resource_exceptions | Jeremy Kemper | 2012-05-10 | 2 | -1/+1 |
|\ | | | | | ActiveResource::TimeoutError is not loaded | ||||
| * | Make sure TimeoutError is loaded. | Yury Velikanau | 2012-05-10 | 2 | -1/+1 |
| | | |||||
* | | Merge pull request #6221 from ↵ | Jeremy Kemper | 2012-05-09 | 1 | -7/+26 |
|\ \ | | | | | | | | | | | | | alexeymuranov/deprecate__instantiate_fixtures__arity Deprecate ActiveRecord::Fixtures.instantiate_fixtures unused parameter | ||||
| * | | Remove deprecated use of ::instantiate_fixtures | Alexey Muranov | 2012-05-10 | 1 | -4/+4 |
| | | | |||||
| * | | Deprecate ::instantiate_fixtures unused parameter | Alexey Muranov | 2012-05-10 | 1 | -3/+22 |
| | | | | | | | | | | | | | | | | | | Deprecate the use of AcitiveRecord::Fixtures::instantiate_fixtures(object, fixture_set_name, fixture_set, load_instances = true), use instead instantiate_fixtures(object, fixture_set, load_instances = true). To be changed in master branch. |