Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #9632 from senny/unify_the_changelogs | Carlos Antonio da Silva | 2013-03-09 | 4 | -36/+37 |
|\ | | | | | Use "Fixes" in place of "Fix" in changelogs for consistency [ci skip] | ||||
| * | Use "Fixes" in place of "Fix" in changelogs for consistency [ci skip]. | Yves Senn | 2013-03-09 | 4 | -36/+37 |
|/ | |||||
* | Merge pull request #9630 from robertjwhitney/update_collection_docs | Carlos Antonio da Silva | 2013-03-09 | 1 | -2/+2 |
|\ | | | | | Update documentation for collection<< to reflect behavior for new parent objects. | ||||
| * | Update documentation for collection<< to reflect << on new records. | Robert Whitney | 2013-03-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | collection<< does not automatically fire update sql unless the parent object is not a new record (and thus has a primary key). eg: p = Post.new p.comments << Comment.new does not call update sql until: p.save at which point it saves the parent object and then the collection object. changes that to the | ||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-03-10 | 9 | -16/+92 |
|\ \ | |||||
| * | | copy edits [ci skip] | Vijay Dev | 2013-03-10 | 2 | -4/+4 |
| | | | |||||
| * | | fixed typo in strong parameters example | Yves Senn | 2013-03-09 | 1 | -1/+1 |
| | | | |||||
| * | | strong parameter example for hashes with integer keys. | Yves Senn | 2013-03-09 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | This replicates the situation described in https://github.com/rails/strong_parameters/issues/114 | ||||
| * | | Adding a note for :body option in `mail` method. | Fabrizio Regini | 2013-03-08 | 1 | -0/+13 |
| | | | |||||
| * | | fixing typo in the merging scopes section | Neeraj Singh | 2013-03-08 | 1 | -4/+3 |
| | | | |||||
| * | | Explained how merging of scope works | Neeraj Singh | 2013-03-08 | 1 | -0/+56 |
| | | | |||||
| * | | Some copy edit and formatting for upgrading guide. | Hendy Tanata | 2013-03-08 | 1 | -3/+3 |
| | | | |||||
| * | | remove the new metadata note in Rails 4 upgrade guide | Alex Robbin | 2013-03-07 | 1 | -6/+0 |
| | | | | | | | | | | | | this was pulled out of Rails 4, see rails/rails#8399 for the discussion | ||||
| * | | fixes active_record_querying #pluck example | awilliams | 2013-03-07 | 1 | -1/+1 |
| | | | |||||
| * | | Update capture_helper.rb | Jess Brown | 2013-03-06 | 1 | -1/+1 |
| | | | | | | | | | if there's content for the right column, then we need the two-column class, if not the one-column | ||||
| * | | Typppo | Akira Matsuda | 2013-03-06 | 3 | -4/+4 |
| | | | |||||
* | | | Fix AMo code example indent, add missing author to entry [ci skip] | Carlos Antonio da Silva | 2013-03-09 | 1 | -6/+8 |
| | | | |||||
* | | | Bump up timeouts | Jon Leighton | 2013-03-09 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | This should fix travis. Also ensuring that we don't try to kill when pid is nil. | ||||
* | | | Merge pull request #9629 from wangjohn/numbering_of_applicationrb_is_off | Steve Klabnik | 2013-03-09 | 1 | -4/+4 |
|\ \ \ | | | | | | | | | Renumbering the comments in the application boot process. | ||||
| * | | | Renumbering the comments in the application boot process. | wangjohn | 2013-03-09 | 1 | -4/+4 |
|/ / / | |||||
* | | | Merge pull request #9627 from rubys/master | Carlos Antonio da Silva | 2013-03-09 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | ensure response.stream is closed | ||||
| * | | ensure response.stream is closed | Sam Ruby | 2013-03-09 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #9621 from sakuro/migration-magic-comment-fix | Jeremy Kemper | 2013-03-09 | 4 | -3/+48 |
|\ \ | | | | | | | Preserve magic comments and content encoding of copied migrations. | ||||
| * | | Preserve magic comments and content encoding of copied migrations. | OZAWA Sakuro | 2013-03-09 | 4 | -3/+48 |
| | | | | | | | | | | | | | | | During insertion of "# This migration comes from ... " comment at the beginning of a migration, presence of magic comment was not considered. | ||||
* | | | Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets | Carlos Antonio da Silva | 2013-03-09 | 3 | -1/+24 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrectly appended square brackets to a multiple select box Before: select(:category, [], {}, {:multiple => true, :name => "post[category][]"}) # => <select name="post[category][][]" ...> After: select(:category, [], {}, {:multiple => true, :name => "post[category][]"}) # => <select name="post[category][]" ...> | ||||
| * | | | Fix incorrectly appended square brackets to a multiple select box | Olek Janiszewski | 2013-03-08 | 3 | -1/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an explicit name has been given and it already ends with "[]" Before: select(:category, [], {}, multiple: true, name: "post[category][]") # => <select name="post[category][][]" ...> After: select(:category, [], {}, multiple: true, name: "post[category][]") # => <select name="post[category][]" ...> | ||||
* | | | | Merge pull request #9623 from Agis-/patch-2 | Carlos Antonio da Silva | 2013-03-09 | 1 | -2/+2 |
|\ \ \ \ | |_|/ / |/| | | | Remove extra whitespace and fix a comment | ||||
| * | | | Remove extra whitespace and fix a comment | Agis Anastasopoulos | 2013-03-09 | 1 | -2/+2 |
|/ / / | | | | | | | minor comment fix for consistency | ||||
* | | | Fix failing test regarding console change to fix sandboxing | Carlos Antonio da Silva | 2013-03-08 | 1 | -11/+10 |
| | | | | | | | | | | | | Introduced in be3e10cd26bc8ec29c6474d03a08a8e733108e7d. | ||||
* | | | Merge pull request #8670 from sanemat/fix/rake-desc | Vijay Dev | 2013-03-08 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | Add rake test description | ||||
| * | | | Add rake test description | sanemat | 2013-01-01 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | No behavior change | ||||
* | | | | Merge pull request #9614 from ↵ | Rafael Mendonça França | 2013-03-08 | 1 | -26/+54 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | wangjohn/refactoring_nested_associations_for_readability Refactored nested associations so they are more readable. | ||||
| * | | | | Refactored nested associations so they are more readable. Added comments | wangjohn | 2013-03-08 | 1 | -26/+54 |
|/ / / / | | | | | | | | | | | | | which make it clearer about what's going on. | ||||
* | | | | Fix changelog indent, remove self from method call in changelog/doc examples | Carlos Antonio da Silva | 2013-03-08 | 2 | -4/+6 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | The console --sandbox transaction should not be joinable | Jon Leighton | 2013-03-08 | 2 | -11/+10 |
| | | | | | | | | | | | | | | | | Thanks @neerajdotname for noticing this bug. | ||||
* | | | | Make sure options is a hash | Rafael Mendonça França | 2013-03-08 | 1 | -1/+3 |
| | | | | |||||
* | | | | Avoid short-circuit return | Rafael Mendonça França | 2013-03-08 | 1 | -5/+9 |
| | | | | |||||
* | | | | Merge pull request #9497 from route/subclass_from_attrs | Rafael Mendonça França | 2013-03-08 | 4 | -2/+22 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | Fix ActiveRecord `subclass_from_attrs` when eager_load is false. Conflicts: activerecord/CHANGELOG.md | ||||
| * | | | Fix ActiveRecord `subclass_from_attrs` when eager_load is false. | Dmitry Vorotilin | 2013-03-06 | 4 | -2/+22 |
| | | | | | | | | | | | | | | | | | | | | It cannot find subclass because all classes are loaded automatically when it needs. | ||||
* | | | | Merge pull request #9611 from choudhuryanupam/master | Rafael Mendonça França | 2013-03-08 | 1 | -40/+40 |
|\ \ \ \ | | | | | | | | | | | Refactored test case with standard variable names | ||||
| * | | | | Refactored test case with standard variable naming | Anupam Choudhury | 2013-03-08 | 1 | -40/+40 |
|/ / / / | |||||
* | | | | Fix rails console --sandbox | Jon Leighton | 2013-03-08 | 3 | -11/+79 |
| | | | | | | | | | | | | | | | | | | | | | | | | I've also added a proper acceptance test which reproduced the issue. Closes #9513, #9515. | ||||
* | | | | Merge pull request #8868 from tehgeekmeister/master | Rafael Mendonça França | 2013-03-08 | 3 | -0/+33 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the index name explicitly provided in a migration when reverting. Fixes #8868 Conflicts: activerecord/CHANGELOG.md | ||||
| * | | | | If an index can't be found by column, use the index name. | Ezekiel Smithburg | 2013-03-07 | 3 | -0/+32 |
| | | | | | | | | | | | | | | | | | | | | schema_statements uses the column name by default to construct the index name, and then raises an exception if it doesn't exist, even if the name option is specified, which causes #8858. this commit makes index_name_for_remove fall back to constructing the index name to remove based on the name option. | ||||
* | | | | | Merge pull request #8966 from ↵ | Rafael Mendonça França | 2013-03-08 | 6 | -3/+33 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cfabianski/disable_prepared_statement_when_preparing_a_query Unprepared Visitor + unprepared_statement Conflicts: activerecord/CHANGELOG.md | ||||
| * | | | | | Unprepared Visitor + unprepared_statement | Cédric FABIANSKI | 2013-03-08 | 6 | -3/+33 |
| |/ / / / | |||||
* | | | | | Merge pull request #9609 from arunagw/using-latest-arjdbc | Carlos Antonio da Silva | 2013-03-08 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | Using latest AR-JDBC for JRuby | ||||
* | | | | | Update test name to reflect change in how scopes merging works | Carlos Antonio da Silva | 2013-03-08 | 2 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced in f1082b8588a9144eedb34d511f0074031f692d98. Full changelog in 9f007d7fe5f90257c71baa2c4e7c76fb44512986. [ci skip] | ||||
* | | | | | Write a more comprehensive CHANGELOG message [ci skip] | Jon Leighton | 2013-03-08 | 1 | -3/+45 |
| | | | | | |||||
* | | | | | Merge pull request #9553 from neerajdotname/7365-mergin-scopes-and-where | Jon Leighton | 2013-03-08 | 3 | -6/+22 |
|\ \ \ \ \ | |/ / / / |/| | | | | 7365 merging scopes for where clauses |