aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Revert "fix a typo"Xavier Noria2012-10-241-1/+1
| | | | | | | | This reverts commit 6d927fb4da7a0a17d62109b7ef8798a8e75082a7.
| * Revert "Consistent headlines & ToC"Xavier Noria2012-10-241-5/+5
| | | | | | | | This reverts commit 506257a173bb5cbb083ccae8d1b4ed82a456006a.
| * With the Asset Pipeline the :cache and :concat options aren't used anymoreGuillermo Iguaran2012-10-241-0/+3
| |
| * Update Upgrading Guide with removal of :cache and :concat optionsGuillermo Iguaran2012-10-241-0/+4
| |
| * Update upgrading notes: users should stop using :concat and :cache options ↵Guillermo Iguaran2012-10-241-0/+4
| | | | | | | | in asset tags
| * fix a typo in comments to ActiveRecord::Associations::Association.stale_stateAndrii Dovgaliuk2012-10-241-1/+1
| |
| * Adding a missing parenthesis in the doc of String#parameterize.Geoffrey Roguelon2012-10-241-2/+2
| |
| * Migration of docs to 1.9 hash syntaxAvnerCohen2012-10-238-54/+54
| |
| * Updated activerecord test comments to new hash syntaxAvnerCohen2012-10-232-4/+4
| |
| * Another batch of hash syntax changes to comment, this time around, I tried ↵AvnerCohen2012-10-233-26/+26
| | | | | | | | to keep 'output' messages untouched.
| * Fixed typo on ActiveRecord nested_attributes.Luis M2012-10-231-3/+3
| |
| * fix output messages - docs [ci skip]Francesco Rodriguez2012-10-229-45/+45
| |
| * convert comments to 1.9 hash syntaxAvnerCohen2012-10-225-30/+30
| |
| * Fix code example in AR::AttributeMethods::BeforeTypeCast.Hendy Tanata2012-10-221-1/+1
| |
| * Merge branch 'master' of https://github.com/lifo/docrailsPablo Ifran2012-10-22258-2448/+3006
| |\ | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/callbacks.rb
| | * read_attribute is public [ci skip]Francesco Rodriguez2012-10-211-1/+1
| | |
| | * add docs to AR::AttributeMethods::BeforeTypeCast [ci skip]Francesco Rodriguez2012-10-211-0/+23
| | |
| | * improve AR::AttributeMethods documentation [ci skip]Francesco Rodriguez2012-10-211-6/+10
| | |
| | * More changes around 1.9 hash syntaxAvnerCohen2012-10-212-4/+4
| | | | | | | | | | | | Added missing space in previous hash related commit
| | * fix error in AssertTagHelper documentation [ci skip]Cesar Carruitero2012-10-211-5/+5
| | |
| | * fix typo and improve example [ci skip]Francesco Rodriguez2012-10-211-1/+3
| | |
| | * update AR::AttributeMethods::BeforeTypeCast docs [ci skip]Francesco Rodriguez2012-10-211-0/+18
| | |
| | * Fix AR::AttributeMethods#[] example [ci skip]Francesco Rodriguez2012-10-211-1/+1
| | |
| | * update AssetTagHelper documentation [ci skip]Cesar Carruitero2012-10-211-21/+21
| | |
| | * fix StrongParameters example [ci skip]Francesco Rodriguez2012-10-211-1/+1
| | |
| | * nodoc deprecated AR::Fixtures constant [ci skip]Francesco Rodriguez2012-10-211-0/+1
| | |
| | * Fixes typo.Lennart Fridén2012-10-211-1/+1
| | |
| | * Wrap a piece of code to a code blockRobin Dupret2012-10-211-0/+2
| | |
| | * Fix a typoAgis Anastasopoulos2012-10-211-1/+1
| | |
| | * Improve grammarAgis Anastasopoulos2012-10-211-2/+2
| | |
| | * Improve grammar a bitAgis Anastasopoulos2012-10-211-1/+1
| | |
| | * Explain where the acronym AJAX stands for & replace "JavaScript writer" with ↵Agis Anastasopoulos2012-10-211-2/+2
| | | | | | | | | | | | "JavaScript developer"
| | * Improve "request response" term typing & fix a minor typoAgis Anastasopoulos2012-10-211-1/+1
| | |
| | * Consistent headlines & ToCAgis Anastasopoulos2012-10-211-5/+5
| | | | | | | | | I believe the topics and their headlines should be consistent for obvious reasons. Also
| | * fix a typoAgis Anastasopoulos2012-10-211-1/+1
| | |
| * | Changeing some code-styles of the examples & fix a typo on dependent optionPablo Ifran2012-10-221-18/+12
| | |
* | | Add test to avoid regression of 1bfc5b4Rafael Mendonça França2012-11-021-0/+8
| | |
* | | Revert "Merge pull request #7668 from Draiken/fix_issue_6497"Rafael Mendonça França2012-11-023-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_8095Rafael Mendonça França2012-11-012-1/+3
|\ \ \ | | | | | | | | Fixed mapping of Solomon Islands.
| * | | Fixed timezone mapping of Solomon Islands.Steve Klabnik2012-11-012-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-1Santiago Pastorino2012-11-011-6/+4
|\ \ \ | | | | | | | | memoize calculated ip without additional variable
| * | | memoize calculated ip without additional variableSergey Nartimov2012-11-011-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 Silva2012-11-012-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_compatibleCarlos Antonio da Silva2012-11-013-1/+46
|\ \ \ | | | | | | | | Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header)
| * | | Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header, now ↵Nikita Afanasenko2012-11-013-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 helpersCarlos Antonio da Silva2012-11-011-2/+7
| | | | | | | | | | | | Closes #8091
* | | Merge pull request #8092 from arunagw/warning_removed_unused_varSantiago Pastorino2012-10-311-1/+1
|\ \ \ | | | | | | | | Small change to remove warning unused variable.
| * | | Small change to remove warning unused variable.Arun Agrawal2012-11-011-1/+1
|/ / /
* | | Merge pull request #8026 from steveklabnik/issue_8025Carlos Antonio da Silva2012-10-312-1/+6
|\ \ \ | | | | | | | | Make sure that RAILS_ENV is set when accessing Rails.env
| * | | Make sure that RAILS_ENV is set when accessing Rails.envSteve Klabnik2012-10-312-1/+6
|/ / / | | | | | | | | | Fixes #8025
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 19:25:02 +0000