| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | Updated activerecord test comments to new hash syntax | AvnerCohen | 2012-10-23 | 2 | -4/+4 | |
| | | | ||||||
| | * | Another batch of hash syntax changes to comment, this time around, I tried ↵ | AvnerCohen | 2012-10-23 | 3 | -26/+26 | |
| | | | | | | | | | to keep 'output' messages untouched. | |||||
| | * | Fixed typo on ActiveRecord nested_attributes. | Luis M | 2012-10-23 | 1 | -3/+3 | |
| | | | ||||||
| | * | fix output messages - docs [ci skip] | Francesco Rodriguez | 2012-10-22 | 9 | -45/+45 | |
| | | | ||||||
| | * | convert comments to 1.9 hash syntax | AvnerCohen | 2012-10-22 | 5 | -30/+30 | |
| | | | ||||||
| | * | Fix code example in AR::AttributeMethods::BeforeTypeCast. | Hendy Tanata | 2012-10-22 | 1 | -1/+1 | |
| | | | ||||||
| | * | Merge branch 'master' of https://github.com/lifo/docrails | Pablo Ifran | 2012-10-22 | 258 | -2448/+3006 | |
| | |\ | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/callbacks.rb | |||||
| | | * | read_attribute is public [ci skip] | Francesco Rodriguez | 2012-10-21 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | add docs to AR::AttributeMethods::BeforeTypeCast [ci skip] | Francesco Rodriguez | 2012-10-21 | 1 | -0/+23 | |
| | | | | ||||||
| | | * | improve AR::AttributeMethods documentation [ci skip] | Francesco Rodriguez | 2012-10-21 | 1 | -6/+10 | |
| | | | | ||||||
| | | * | More changes around 1.9 hash syntax | AvnerCohen | 2012-10-21 | 2 | -4/+4 | |
| | | | | | | | | | | | | | Added missing space in previous hash related commit | |||||
| | | * | fix error in AssertTagHelper documentation [ci skip] | Cesar Carruitero | 2012-10-21 | 1 | -5/+5 | |
| | | | | ||||||
| | | * | fix typo and improve example [ci skip] | Francesco Rodriguez | 2012-10-21 | 1 | -1/+3 | |
| | | | | ||||||
| | | * | update AR::AttributeMethods::BeforeTypeCast docs [ci skip] | Francesco Rodriguez | 2012-10-21 | 1 | -0/+18 | |
| | | | | ||||||
| | | * | Fix AR::AttributeMethods#[] example [ci skip] | Francesco Rodriguez | 2012-10-21 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | update AssetTagHelper documentation [ci skip] | Cesar Carruitero | 2012-10-21 | 1 | -21/+21 | |
| | | | | ||||||
| | | * | fix StrongParameters example [ci skip] | Francesco Rodriguez | 2012-10-21 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | nodoc deprecated AR::Fixtures constant [ci skip] | Francesco Rodriguez | 2012-10-21 | 1 | -0/+1 | |
| | | | | ||||||
| | | * | Fixes typo. | Lennart Fridén | 2012-10-21 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | Wrap a piece of code to a code block | Robin Dupret | 2012-10-21 | 1 | -0/+2 | |
| | | | | ||||||
| | | * | Fix a typo | Agis Anastasopoulos | 2012-10-21 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | Improve grammar | Agis Anastasopoulos | 2012-10-21 | 1 | -2/+2 | |
| | | | | ||||||
| | | * | Improve grammar a bit | Agis Anastasopoulos | 2012-10-21 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | Explain where the acronym AJAX stands for & replace "JavaScript writer" with ↵ | Agis Anastasopoulos | 2012-10-21 | 1 | -2/+2 | |
| | | | | | | | | | | | | | "JavaScript developer" | |||||
| | | * | Improve "request response" term typing & fix a minor typo | Agis Anastasopoulos | 2012-10-21 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | Consistent headlines & ToC | Agis Anastasopoulos | 2012-10-21 | 1 | -5/+5 | |
| | | | | | | | | | | I believe the topics and their headlines should be consistent for obvious reasons. Also | |||||
| | | * | fix a typo | Agis Anastasopoulos | 2012-10-21 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Changeing some code-styles of the examples & fix a typo on dependent option | Pablo Ifran | 2012-10-22 | 1 | -18/+12 | |
| | | | | ||||||
| * | | | Add test to avoid regression of 1bfc5b4 | Rafael Mendonça França | 2012-11-02 | 1 | -0/+8 | |
| | | | | ||||||
| * | | | Revert "Merge pull request #7668 from Draiken/fix_issue_6497" | Rafael Mendonça França | 2012-11-02 | 3 | -18/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f4ad0ebe7a6b17658bddfeb996e3c34835b75623, reversing changes made to 8b2cbb3a832101f0e672ee309beca0f8c555b292. Conflicts: actionpack/CHANGELOG.md REASON: This added introduced a bug when you have a shorthand route inside a nested namespace. See https://github.com/rafaelfranca/rails/commit/281367eb770faf8077c1fd6194188e92ed1637a1 | |||||
| * | | | Merge pull request #8097 from steveklabnik/issue_8095 | Rafael Mendonça França | 2012-11-01 | 2 | -1/+3 | |
| |\ \ \ | | | | | | | | | Fixed mapping of Solomon Islands. | |||||
| | * | | | Fixed timezone mapping of Solomon Islands. | Steve Klabnik | 2012-11-01 | 2 | -1/+3 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | Fixes #8095. For reference, here is the discussion about the mapping being incorrect: http://rubyforge.org/pipermail/tzinfo-users/2012-November/000114.html | |||||
| * | | | Merge pull request #8019 from lest/patch-1 | Santiago Pastorino | 2012-11-01 | 1 | -6/+4 | |
| |\ \ \ | | | | | | | | | memoize calculated ip without additional variable | |||||
| | * | | | memoize calculated ip without additional variable | Sergey Nartimov | 2012-11-01 | 1 | -6/+4 | |
| |/ / / | | | | | | | | | | There is no need in additional `@calculated_ip` instance variable. | |||||
| * | | | Fix issue with collection associations and first(n)/last(n) | Carlos Antonio da Silva | 2012-11-01 | 2 | -1/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling first(n) or last(n) in a collection, Active Record was improperly trying to set the inverse of instance in case that option existed. This change was introduced by fdf4eae506fa9895e831f569bed3c4aa6a999a22. In such cases we don't need to do that "manually", since the way collection will be loaded will already handle that, so we just skip setting the inverse association when any argument is given to first(n)/last(n). The test included ensures that these scenarios will have the inverse of instance set properly. Fixes #8087, Closes #8094. Squashed cherry-pick from d37d40b and c368b66. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/associations/collection_association.rb | |||||
| * | | | Merge pull request #8093 from nikitug/keep_app_x_ua_compatible | Carlos Antonio da Silva | 2012-11-01 | 3 | -1/+46 | |
| |\ \ \ | | | | | | | | | Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header) | |||||
| | * | | | Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header, now ↵ | Nikita Afanasenko | 2012-11-01 | 3 | -1/+46 | |
| |/ / / | | | | | | | | | | | | | | | | | | | appends). Now `BestStandardsSupport` middleware appends it's `X-UA-Compatible` value to app's value. Also test for `BestStandardsSupport` middleware added. | |||||
| * | | | Add test to ensure data attributes are properly escaped with tag helpers | Carlos Antonio da Silva | 2012-11-01 | 1 | -2/+7 | |
| | | | | | | | | | | | | | Closes #8091 | |||||
| * | | | Merge pull request #8092 from arunagw/warning_removed_unused_var | Santiago Pastorino | 2012-10-31 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | Small change to remove warning unused variable. | |||||
| | * | | | Small change to remove warning unused variable. | Arun Agrawal | 2012-11-01 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | Merge pull request #8026 from steveklabnik/issue_8025 | Carlos Antonio da Silva | 2012-10-31 | 2 | -1/+6 | |
| |\ \ \ | | | | | | | | | Make sure that RAILS_ENV is set when accessing Rails.env | |||||
| | * | | | Make sure that RAILS_ENV is set when accessing Rails.env | Steve Klabnik | 2012-10-31 | 2 | -1/+6 | |
| |/ / / | | | | | | | | | | Fixes #8025 | |||||
| * | | | Revert "Don't allocate new strings in compiled attribute methods" | David Heinemeier Hansson | 2012-10-31 | 2 | -39/+20 | |
| | | | | | | | | | | | | | This reverts commit f1765019ce9b6292f2264b4601dad5daaffe3a89. | |||||
| * | | | No need for the debugger | David Heinemeier Hansson | 2012-10-31 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | Allow #permit to take its list of permitted parameters as an array | David Heinemeier Hansson | 2012-10-31 | 2 | -1/+6 | |
| | | | | ||||||
| * | | | Revert "if format is unknown NullMimeTypeObject is returned" | Guillermo Iguaran | 2012-10-31 | 3 | -28/+2 | |
| | | | | | | | | | | | | | This reverts commit a8560fa361958b33d76e4468eb5c07d82a20196e. | |||||
| * | | | Remove extre count, preheat already happens during setup | Carlos Antonio da Silva | 2012-10-31 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | Merge pull request #8073 from alexisbernard/fix_find_in_batches_start_option | Carlos Antonio da Silva | 2012-10-31 | 3 | -2/+15 | |
| |\ \ \ | | | | | | | | | Fix find_in_batches against string IDs when start option is not specified | |||||
| | * | | | Fix find_in_batches against string IDs when start option is not specified. | Alexis Bernard | 2012-10-31 | 3 | -2/+15 | |
| |/ / / | ||||||
| * | | | Merge pull request #8084 from acapilleri/format_never_nil | Rafael Mendonça França | 2012-10-31 | 3 | -2/+28 | |
| |\ \ \ | | | | | | | | | if format is unknown NullMimeTypeObject is returned | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |