Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | 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 | Olek Janiszewski | 2013-03-08 | 3 | -1/+24 | |
* | | | | 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 | Agis Anastasopoulos | 2013-03-09 | 1 | -2/+2 | |
|/ / / | ||||||
* | | | Fix failing test regarding console change to fix sandboxing | Carlos Antonio da Silva | 2013-03-08 | 1 | -11/+10 | |
* | | | Merge pull request #8670 from sanemat/fix/rake-desc | Vijay Dev | 2013-03-08 | 1 | -0/+2 | |
|\ \ \ | ||||||
| * | | | Add rake test description | sanemat | 2013-01-01 | 1 | -0/+2 | |
* | | | | Merge pull request #9614 from wangjohn/refactoring_nested_associations_for_re... | Rafael Mendonça França | 2013-03-08 | 1 | -26/+54 | |
|\ \ \ \ | ||||||
| * | | | | Refactored nested associations so they are more readable. Added comments | wangjohn | 2013-03-08 | 1 | -26/+54 | |
|/ / / / | ||||||
* | | | | Fix changelog indent, remove self from method call in changelog/doc examples | Carlos Antonio da Silva | 2013-03-08 | 2 | -4/+6 | |
* | | | | The console --sandbox transaction should not be joinable | Jon Leighton | 2013-03-08 | 2 | -11/+10 | |
* | | | | 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. | Dmitry Vorotilin | 2013-03-06 | 4 | -2/+22 | |
* | | | | Merge pull request #9611 from choudhuryanupam/master | Rafael Mendonça França | 2013-03-08 | 1 | -40/+40 | |
|\ \ \ \ | ||||||
| * | | | | 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 | |
* | | | | Merge pull request #8868 from tehgeekmeister/master | Rafael Mendonça França | 2013-03-08 | 3 | -0/+33 | |
|\ \ \ \ | ||||||
| * | | | | If an index can't be found by column, use the index name. | Ezekiel Smithburg | 2013-03-07 | 3 | -0/+32 | |
* | | | | | Merge pull request #8966 from cfabianski/disable_prepared_statement_when_prep... | Rafael Mendonça França | 2013-03-08 | 6 | -3/+33 | |
|\ \ \ \ \ | ||||||
| * | | | | | 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 | |
* | | | | | Update test name to reflect change in how scopes merging works | Carlos Antonio da Silva | 2013-03-08 | 2 | -3/+2 | |
* | | | | | 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 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Combine scope conditions using AND | Neeraj Singh and John Leighton | 2013-03-07 | 3 | -6/+22 | |
* | | | | | Fix warnings | Carlos Antonio da Silva | 2013-03-07 | 1 | -2/+2 | |
* | | | | | Merge pull request #9605 from neerajdotname/sqlite-support-savepoint | Carlos Antonio da Silva | 2013-03-07 | 1 | -1/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | SQLite3 3.6.8+ supports savepoints | Neeraj Singh | 2013-03-07 | 1 | -1/+2 | |
| |/ / / / | ||||||
* | | | | | Fix hash spaces and use 1.9 style hash [ci skip] | Carlos Antonio da Silva | 2013-03-07 | 1 | -1/+1 | |
* | | | | | Move AP changelog entry to the top [ci skip] | Carlos Antonio da Silva | 2013-03-07 | 1 | -6/+6 | |
|/ / / / | ||||||
* | | | | Merge pull request #9464 from jcoyne/assert_template_file | Rafael Mendonça França | 2013-03-07 | 5 | -2/+59 | |
|\ \ \ \ | ||||||
| * | | | | Allow use of assert_template with the :file option. | Justin Coyne | 2013-03-01 | 5 | -2/+59 | |
* | | | | | Merge pull request #9597 from senny/9110_serialized_not_null_default | Rafael Mendonça França | 2013-03-07 | 4 | -0/+13 | |
|\ \ \ \ \ | ||||||
| * | | | | | test case for `serialize` default values. | Yves Senn | 2013-03-07 | 4 | -0/+13 | |
* | | | | | | Merge pull request #9105 from bemurphy/cache_key_updated_on | Rafael Mendonça França | 2013-03-07 | 5 | -3/+39 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | cache_key consults updated_on timestamp if present | Brendon Murphy | 2013-02-26 | 5 | -3/+39 | |
* | | | | | | Merge pull request #9474 from HonoreDB/master | Rafael Mendonça França | 2013-03-07 | 3 | -0/+21 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | More helpful error message when instantiating an abstract class | Aaron Weiner | 2013-03-03 | 3 | -0/+21 | |
* | | | | | | | Merge pull request #9545 from senny/9535_secure_password_blank | Rafael Mendonça França | 2013-03-07 | 5 | -3/+75 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | `has_secure_password` is not invalid when assigning empty Strings. | Yves Senn | 2013-03-04 | 3 | -2/+24 | |
| * | | | | | | | `validates_confirmation_of` does not override writer methods. | Yves Senn | 2013-03-04 | 3 | -1/+51 | |
* | | | | | | | | Merge pull request #9595 from senny/remove_non_breaking_spaces | Rafael Mendonça França | 2013-03-07 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | replace non-breaking spaces with normal spaces [ci skip] | Yves Senn | 2013-03-07 | 2 | -4/+4 | |
* | | | | | | | | | Merge pull request #9596 from choudhuryanupam/master | Rafael Mendonça França | 2013-03-07 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Refactored and removed unnecessary lines in the test case | Anupam Choudhury | 2013-03-07 | 1 | -3/+3 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Remove regression test added in 0268b5d8cdc3c5a1337462135f0a326a2654ba1a | Rafael Mendonça França | 2013-03-07 | 1 | -8/+0 | |
* | | | | | | | | debugger 1.4.0 works in Ruby 2.0 | Santiago Pastorino | 2013-03-06 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #9586 from robertomiranda/useless_tr | Rafael Mendonça França | 2013-03-06 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ |