| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Refactor generators tests to include test helpers in the parent class | Carlos Antonio da Silva | 2012-11-27 | 1 | -4/+3 | |
| | | | ||||||
| * | | Merge pull request #8329 from elia/fix-send-data-disposition-with-symbols-master | Carlos Antonio da Silva | 2012-11-26 | 3 | -0/+15 | |
| |\ \ | | | | | | | Accept symbols as #send_data :disposition value | |||||
| | * | | Accept symbols as #send_data :disposition value | Elia Schito | 2012-11-27 | 3 | -0/+15 | |
| |/ / | ||||||
| * | | Merge pull request #7282 from xHire/validates_length_of_fix | Rafael Mendonça França | 2012-11-26 | 3 | -2/+57 | |
| |\ \ | | | | | | | | | | | | | | | | | | | Length validation handles correctly nil. Fix #7180 Conflicts: activemodel/CHANGELOG.md | |||||
| | * | | Length validation handles correctly nil. Fix #7180 | Michal Zima | 2012-11-26 | 3 | -2/+57 | |
| | | | | | | | | | | | | | When nil or empty string are not allowed, they are not valid. | |||||
| * | | | Merge pull request #8324 from steveklabnik/changelog_7997 | Rafael Mendonça França | 2012-11-26 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | @steveklabnik can't spell 'distance.' | |||||
| | * | | | @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. | |||||
| | * | | | Add changelog for #7997. | Steve Klabnik | 2012-11-26 | 1 | -0/+2 | |
| |/ / / | | | | | | | | | | This was forgotten when we did the merge. | |||||
| * | | | Merge pull request #8319 from alindeman/typo | Carlos Antonio da Silva | 2012-11-26 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | Corrects typo in test name [ci skip] | |||||
| | * | | | 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. There's no logging going on here, but since we initialize the app, the logger is set and the folder is automatically created. With this change, the default logger is not created, so there is no logging folder anymore. Conflicts: activemodel/test/cases/railtie_test.rb | |||||
| | * | | | | log output from activemodel's railtie_test directly to STDOUT | Yves Senn | 2012-11-26 | 1 | -0/+1 | |
| | | |/ / | |/| | | | | | | | | | | | | | | after this patch, running the tests in activemodel will no longer create an untracked log/ folder inside of activemodel | |||||
| * | | | | Merge pull request #6197 from ↵ | Xavier Noria | 2012-11-26 | 3 | -6/+24 | |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | blakesmith/connection_adapters_without_explain_support Don't run explain on slow queries for database adapters that don't support it | |||||
| | * | | | 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 ↵ | Rafael Mendonça França | 2012-11-26 | 9 | -21/+14 | |
| |\ \ \ | | | | | | | | | | | | | | | | | senny/make_active_model_parts_individually_loadable make sure that individual parts `ActiveModel` can be required by itself | |||||
| | * | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the routes for each test inside the test method so that it's easier to see which routes are applicable to which test. To ensure that each test wasn't invalidated the changes were done by first removing all of the routes, ensuring that all of the tests failed and then adding the routes back to each test one by one. One test for `assert_recognizes` was removed as it wasn't actually testing the defined routes and is now tested more thoroughly in routing_assertions_test.rb. One downside is that the test suite takes about 1s longer due to having to using `method_missing` for handling the url helpers as using `include url_helpers` isn't isolated for each test. | |||||
| * | | | | Require active_model/railtie directly instead of rails/all | Carlos Antonio da Silva | 2012-11-26 | 1 | -3/+3 | |
| | |/ / |/| | | | | | | | | Use Class.new with a block instead of tap to configure it. | |||||
| * | | | 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 It only handles the keys locals, partial, layout and count. assert_template(foo: "bar") # raises ArgumentError assert_template(leiaute: "test") # raises ArgumentError | |||||
| | * | | | 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 | |||||
| | * | | | | Add explicit opt-out for fragment cache digesting | Drew Ulmer | 2012-11-25 | 3 | -1/+38 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This add support for sending an explicit opt-out of the "Russian-doll" cache digest feature on a case-by-case basis. This is useful when cache- expiration needs to be performed manually and it would be otherwise difficult to know the exact name of a digested cache key. More information: https://github.com/rails/cache_digests/pull/16 | |||||
| * | | | | | 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("") will now fail no matter whether a template has been rendered or not. | |||||
| | * | | | `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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For instance, it prevents false positive in this case: file = nil get :index assert_template("#{file}") | |||||
| * | | | | 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->"". | |||||
| | * | | | Don't call will_change! for datetime nil->"". | Alisdair McDiarmid | 2012-11-25 | 3 | -0/+21 | |
| |/ / / | | | | | | | | | | | | | | | | | | | Setting a nil datetime attribute to a blank string should not cause the attribute to be dirty. Fix #8310 | |||||
| * | | | 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 [ci skip] | |||||
| | * | | 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 | |
| | | | | | | | | | | | | | | | | Introduced in 53ca22f2e11cd3050d75385bc31b6bb5055a2738. Thanks @rochefort. [ci skip] | |||||
| * | | | Refector a bit to remove extra slice iteration and splat call | Carlos Antonio da Silva | 2012-11-24 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This yields a small bit of performance improvement when building the defaults from constraints, specially considering that it's rather common for constraints to be empty. Also, there's a bit of duplicated code in here that I have to check before extracting. | |||||
| * | | | 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 | |
| | | | | | | | | | | | | | | | | | | | Instead of iterating again over the options and setting one by one, we can just merge the recover hash back to the scope one since all keys match. | |||||
| * | | | Normalize scope recovering :blocks option name | Carlos Antonio da Silva | 2012-11-24 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | Use the same :blocks key in the recover hash to revert the scope options later. | |||||
| * | | | 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` Conflicts: activerecord/CHANGELOG.md | |||||
| | * | | | prevent mass assignment of polymorphic type when using `build` | Yves Senn | 2012-11-22 | 3 | -1/+15 | |
| | | | | | | | | | | | | | | | | | Closes #8265 | |||||
| * | | | | Indent changelog markdown code to highlight correctly | Carlos Antonio da Silva | 2012-11-22 | 1 | -11/+11 | |
| | | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | 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 | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |