Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #8324 from steveklabnik/changelog_7997 | Rafael Mendonça França | 2012-11-26 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | @steveklabnik can't spell 'distance.' | Steve Klabnik | 2012-11-26 | 1 | -1/+1 | |
* | | | | | | Merge pull request #8323 from steveklabnik/changelog_7997 | Rafael Mendonça França | 2012-11-26 | 1 | -0/+2 | |
|\| | | | | | ||||||
| * | | | | | Add changelog for #7997. | Steve Klabnik | 2012-11-26 | 1 | -0/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #8319 from alindeman/typo | Carlos Antonio da Silva | 2012-11-26 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Corrects typo in test name | Andy Lindeman | 2012-11-26 | 1 | -1/+1 | |
* | | | | | | Merge pull request #8320 from senny/active_model_log_folder | Carlos Antonio da Silva | 2012-11-26 | 1 | -0/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | log output from activemodel's railtie_test directly to STDOUT | Yves Senn | 2012-11-26 | 1 | -0/+1 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #6197 from blakesmith/connection_adapters_without_explain_... | Xavier Noria | 2012-11-26 | 3 | -6/+24 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Don't run explain on slow queries for database adapters that don't support it | Blake Smith | 2012-11-26 | 3 | -6/+24 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #8312 from senny/make_active_model_parts_individually_load... | Rafael Mendonça França | 2012-11-26 | 9 | -21/+14 | |
|\ \ \ \ \ | ||||||
| * | | | | | cleanup, removed dispensable `require` statements from `ActiveModel` | Yves Senn | 2012-11-25 | 8 | -12/+5 | |
| * | | | | | cleanup, remove broken whitespace | Yves Senn | 2012-11-25 | 4 | -9/+9 | |
* | | | | | | Improve clarity of routing tests | Andrew White | 2012-11-26 | 1 | -634/+1081 | |
* | | | | | | Require active_model/railtie directly instead of rails/all | Carlos Antonio da Silva | 2012-11-26 | 1 | -3/+3 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #8316 from roberto/assert_template_validate_options | Carlos Antonio da Silva | 2012-11-26 | 3 | -1/+11 | |
|\ \ \ \ \ | ||||||
| * | | | | | assert_template: validating option keys | Roberto Soares | 2012-11-25 | 3 | -1/+11 | |
* | | | | | | Merge pull request #8317 from latortuga/cache-digest-opt-out | David Heinemeier Hansson | 2012-11-26 | 3 | -1/+38 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add explicit opt-out for fragment cache digesting | Drew Ulmer | 2012-11-25 | 3 | -1/+38 | |
* | | | | | | | schema cache already has the columns as a hash, so use that | Aaron Patterson | 2012-11-25 | 2 | -2/+12 | |
* | | | | | | | speed up fixture loading by querying the schema cache for column names | Aaron Patterson | 2012-11-25 | 2 | -2/+11 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #8302 from roberto/assert_template_empty_string | Carlos Antonio da Silva | 2012-11-25 | 3 | -1/+19 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | `assert_template` fails with empty string. | Roberto Soares | 2012-11-23 | 3 | -9/+12 | |
| * | | | | | `assert_template` fails with empty string when a template has been rendered | Roberto Soares | 2012-11-23 | 3 | -4/+19 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #8311 from alisdair/dirty-nullable-datetime | Carlos Antonio da Silva | 2012-11-25 | 3 | -0/+21 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Don't call will_change! for datetime nil->"". | Alisdair McDiarmid | 2012-11-25 | 3 | -0/+21 | |
|/ / / / | ||||||
* | | | | Merge pull request #8306 from senny/documentation_for_hidden_field_id | Carlos Antonio da Silva | 2012-11-24 | 1 | -0/+5 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | document :hidden_field_id option for fields_for | Yves Senn | 2012-11-24 | 1 | -0/+5 | |
* | | | | Fix changelog entry about fast_string_to_time fix | Carlos Antonio da Silva | 2012-11-24 | 1 | -2/+2 | |
* | | | | Refector a bit to remove extra slice iteration and splat call | Carlos Antonio da Silva | 2012-11-24 | 1 | -2/+2 | |
* | | | | Use merge! in some places to avoid creating extra hashes | Carlos Antonio da Silva | 2012-11-24 | 2 | -4/+4 | |
* | | | | Simplify scope options recovery by using merge! | Carlos Antonio da Silva | 2012-11-24 | 1 | -6/+1 | |
* | | | | Normalize scope recovering :blocks option name | Carlos Antonio da Silva | 2012-11-24 | 1 | -3/+3 | |
* | | | | Simplify constraints condition in scope when checking for Hash | Carlos Antonio da Silva | 2012-11-24 | 1 | -7/+4 | |
* | | | | Move initialize_copy method around to let new method / build alias closer | Carlos Antonio da Silva | 2012-11-24 | 1 | -8/+8 | |
| |/ / |/| | | ||||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-11-23 | 3 | -4/+4 | |
|\ \ \ | ||||||
| * | | | fixed a minor spelling error | Lennart Tange | 2012-11-20 | 1 | -1/+1 | |
| * | | | embed code example using backticks in caching guide | Sergey Nartimov | 2012-11-20 | 1 | -2/+2 | |
| * | | | remove previous commit | Michel Grootjans | 2012-11-20 | 1 | -1/+1 | |
| * | | | bug in example '<%= form_for ...' should be '<% form_for ...' | Michel Grootjans | 2012-11-20 | 1 | -1/+1 | |
| * | | | Fix broken link in Active Record Query Interface guide | Jaime Iniesta | 2012-11-18 | 1 | -1/+1 | |
* | | | | Merge pull request #8291 from senny/8265_build_with_polymorphic_association | Rafael Mendonça França | 2012-11-22 | 3 | -1/+15 | |
|\ \ \ \ | ||||||
| * | | | | prevent mass assignment of polymorphic type when using `build` | Yves Senn | 2012-11-22 | 3 | -1/+15 | |
* | | | | | Indent changelog markdown code to highlight correctly | Carlos Antonio da Silva | 2012-11-22 | 1 | -11/+11 | |
* | | | | | Merge pull request #8114 from guilleiguaran/use-symbols-in-scope | Andrew White | 2012-11-22 | 3 | -1/+43 | |
|\ \ \ \ \ | ||||||
| * | | | | | Allow setting a symbol as path in scope on routes | Guillermo Iguaran | 2012-11-21 | 3 | -1/+43 | |
|/ / / / / | ||||||
* | | | | | Remove private partial/template renderer methods | Carlos Antonio da Silva | 2012-11-21 | 3 | -14/+3 | |
* | | | | | Merge branch 'deprecate-calculations-with-block' | Carlos Antonio da Silva | 2012-11-21 | 6 | -49/+25 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove the #sum method from CollectionAssociation | Carlos Antonio da Silva | 2012-11-21 | 1 | -9/+0 | |
| * | | | | | Deprecate Relation#sum with a block. | Carlos Antonio da Silva | 2012-11-21 | 5 | -3/+22 |