| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | 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 | |||||
| | * | | | if format is unknown NullMimeTypeObject is returned | Angelo capilleri | 2012-10-31 | 3 | -2/+28 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a unknown format is passed in a request, the methods html?, xml?, json? ...etc Nil Exception. This patch add a class NullMimeTypeObject, that is returned when request.format is unknown and it responds false to the methods that ends with '?'. It refers to #7837, not fixes because it's not considered a improvement not a bug. | |||||
| * | | | Merge pull request #8078 from nikitug/serialized_attributes_before_type_cast | Carlos Antonio da Silva | 2012-10-31 | 3 | -3/+27 | |
| |\ \ \ | | | | | | | | | Fix `attributes_before_type_cast` for serialized attributes. | |||||
| | * | | | Fix `attributes_before_type_cast` for serialised attributes. | Nikita Afanasenko | 2012-10-31 | 3 | -3/+27 | |
| |/ / / | | | | | | | | | | Public method `attributes_before_type_cast` used to return internal AR structure (ActiveRecord::AttributeMethods::Serialization::Attribute), patch fixes this. Now behaves like `read_attribute_before_type_cast` and returns unserialised values. | |||||
| * | | | Merge pull request #8074 from kennyj/fix_6951 | Rafael Mendonça França | 2012-10-30 | 3 | -6/+22 | |
| |\ \ \ | | | | | | | | | Fix #6951. Use query cache/uncache, when using not only database.yml but also DATABASE_URL. | |||||
| | * | | | Fix #6951. Use query cache/uncache, when using not only database.yml but ↵ | kennyj | 2012-10-31 | 3 | -6/+22 | |
| |/ / / | | | | | | | | | | also DATABASE_URL. | |||||
| * | | | Revert "Support `Mailer.deliver_foo(*args)` as a synonym for ↵ | Jon Leighton | 2012-10-30 | 3 | -15/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Mailer.foo(*args).deliver`." This reverts commit 7e0cf563639bc7508da381b1b8321c7a89be1aa8. Conflicts: actionmailer/CHANGELOG.md See discussion at https://github.com/rails/rails/commit/7e0cf563639bc7508da381b1b8321c7a89be1aa8#commitcomment-2075489 | |||||
| * | | | Revert "The debugger gem isn't compatible with 1.9.3-p286 yet. Omit it for now." | Santiago Pastorino | 2012-10-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | This reverts commit 7b290ad13c294005db062e746f8b79c8a192e4fa. debugger gem is now working ok with p286 | |||||
| * | | | Merge pull request #8072 from kennyj/remove_mattr_include_root_in_json | Carlos Antonio da Silva | 2012-10-30 | 2 | -1/+16 | |
| |\ \ \ | | | | | | | | | Allow include_root_in_json to be inheritable by using the class_attribute created by Active Model serialization module. | |||||
| | * | | | include_root_in_json allows inheritance. | kennyj | 2012-10-31 | 2 | -1/+16 | |
| | | | | | ||||||
| * | | | | Merge pull request #6107 from ↵ | Carlos Antonio da Silva | 2012-10-30 | 37 | -56/+59 | |
| |\| | | | | | | | | | | | | | | | | | | | gazay/make_caller_attribute_in_deprecation_optional Make callstack attribute optional in AS:Deprecation | |||||
| | * | | | Make caller attribute in deprecation methods optional | Alexey Gaziev | 2012-10-30 | 37 | -56/+59 | |
| |/ / / | ||||||
| * | | | Remove not assigned variable warning from sqlite3 adapter test | Carlos Antonio da Silva | 2012-10-29 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Fix bug when Column is trying to type cast boolean values to integer. | Rafael Mendonça França | 2012-10-29 | 2 | -6/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can occur if the user is using :integer columns to store boolean values. Now we are handling the boolean values but it still raises if the value can't type cast to integer and is not a boolean. See #7509. Fixes #8067. Conflicts: activerecord/CHANGELOG.md | |||||
| * | | | Merge pull request #8066 from cfabianski/AddTestForSerializationMethod | Carlos Antonio da Silva | 2012-10-29 | 1 | -0/+9 | |
| |\ \ \ | | | | | | | | | Add test for code change introduced in this commit f20032f | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |