aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Revert "Don't allocate new strings in compiled attribute methods"David Heinemeier Hansson2012-10-312-39/+20
| | | | This reverts commit f1765019ce9b6292f2264b4601dad5daaffe3a89.
* No need for the debuggerDavid Heinemeier Hansson2012-10-311-1/+0
|
* Allow #permit to take its list of permitted parameters as an arrayDavid Heinemeier Hansson2012-10-312-1/+6
|
* Revert "if format is unknown NullMimeTypeObject is returned"Guillermo Iguaran2012-10-313-28/+2
| | | | This reverts commit a8560fa361958b33d76e4468eb5c07d82a20196e.
* Remove extre count, preheat already happens during setupCarlos Antonio da Silva2012-10-311-1/+0
|
* Merge pull request #8073 from alexisbernard/fix_find_in_batches_start_optionCarlos Antonio da Silva2012-10-313-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 Bernard2012-10-313-2/+15
|/
* Merge pull request #8084 from acapilleri/format_never_nilRafael Mendonça França2012-10-313-2/+28
|\ | | | | if format is unknown NullMimeTypeObject is returned
| * if format is unknown NullMimeTypeObject is returnedAngelo capilleri2012-10-313-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_castCarlos Antonio da Silva2012-10-313-3/+27
|\ | | | | Fix `attributes_before_type_cast` for serialized attributes.
| * Fix `attributes_before_type_cast` for serialised attributes.Nikita Afanasenko2012-10-313-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_6951Rafael Mendonça França2012-10-303-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 ↵kennyj2012-10-313-6/+22
|/ | | | also DATABASE_URL.
* Revert "Support `Mailer.deliver_foo(*args)` as a synonym for ↵Jon Leighton2012-10-303-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 Pastorino2012-10-301-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_jsonCarlos Antonio da Silva2012-10-302-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.kennyj2012-10-312-1/+16
| |
* | Merge pull request #6107 from ↵Carlos Antonio da Silva2012-10-3037-56/+59
|\| | | | | | | | | gazay/make_caller_attribute_in_deprecation_optional Make callstack attribute optional in AS:Deprecation
| * Make caller attribute in deprecation methods optionalAlexey Gaziev2012-10-3037-56/+59
|/
* Remove not assigned variable warning from sqlite3 adapter testCarlos Antonio da Silva2012-10-291-1/+1
|
* Fix bug when Column is trying to type cast boolean values to integer.Rafael Mendonça França2012-10-292-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/AddTestForSerializationMethodCarlos Antonio da Silva2012-10-291-0/+9
|\ | | | | Add test for code change introduced in this commit f20032f
| * Add test for code change introduced in this commit f20032fCédric FABIANSKI2012-10-291-0/+9
|/
* Fix failing tests and use new hash style in deprecation messagesCarlos Antonio da Silva2012-10-296-28/+28
|
* Merge pull request #8063 from nikitug/deprecation_caller_contextCarlos Antonio da Silva2012-10-2927-55/+88
|\ | | | | Provide a call stack for deprecation warnings where needed.
| * Provide a call stack for deprecation warnings where needed.Nikita Afanasenko2012-10-2927-55/+88
| | | | | | | | It's sometimes hard to quickly find where deprecated call was performed, especially in case of migrating between Rails versions. So this is an attempt to improve the call stack part of the warning message by providing caller explicitly.
* | Fix deprecation message in test for Path#childrenCarlos Antonio da Silva2012-10-291-1/+1
|/
* Add test to deprecation of Path#childrenRafael Mendonça França2012-10-291-0/+6
|
* Merge pull request #7587 from elia/fix-too-eager-loadingRafael Mendonça França2012-10-293-6/+17
| | | | | | Should not eager_load app/assets Conflicts: railties/CHANGELOG.md
* Merge pull request #8027 from daenney/masterXavier Noria2012-10-293-3/+12
|\ | | | | Atomic.rb assumes it may chown/chmod a file but doesn't handle the EPERM error.
| * atomicc.rb: Don't assume we may chown/chmod a file.Daniele Sluijters2012-10-293-3/+12
|/ | | | | | | | | | | | | | | | | | | | | | Previously this code just assumed it is capable of changing the file ownership, both user and group. This will fail in a lot of scenario's unless: * The process is run as a superuser (root); * The owning user and group are already set to the user and group we're trying to chown to; * The user chown'ing only changes the group to another group it is a member of. If either of those conditions are not met the filesystem will simply deny the operation throwing an error. It is also not always possible to do a chmod, there might be a SELinux policy or another limitation preventing the user to change the file mode. To this end the chmod call has also been added to the rescue block. I've also added a little comment above the chmod command that doing a chmod on a file which has an ACL set will cause the ACL to be recalculated / modified.
* Fix the skip code.Rafael Mendonça França2012-10-281-4/+4
| | | | Checking for the constant doesn't work
* Merge pull request #8057 from frodsan/fix_sqlite_mutate_argRafael Mendonça França2012-10-282-1/+7
|\ | | | | SQLite3Adapter#type_cast should not mutate arguments
| * SQLite3Adapter#type_cast should not mutate argumentsStefan Rusterholz2012-10-282-1/+7
|/
* Merge pull request #7750 from xuanxu/none_modificating_relation_in_placeRafael Mendonça França2012-10-284-0/+25
|\ | | | | Added ActiveRecord::Relation#none! method
| * ActiveRecord::Relation#none! method.Juanjo Bazán2012-10-283-0/+16
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-13 23:21:10 +0000