aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #7392 from ernie/real-fix-for-last-equality-wins-in-mergeRafael Mendonça França2012-08-192-14/+12
|\ \ \ | | | | | | | | Fix "last equality wins" logic in relation merge
| * | | Fix "last equality wins" logic in relation mergeErnie Miller2012-08-192-14/+12
|/ / / | | | | | | | | | | | | | | | This is a real fix (as compared to the band-aid in b127d86c), which uses the recently-added equality methods for ARel nodes. It has the side benefit of simplifying the merge code a bit.
* | | Merge pull request #7377 from ↵Carlos Antonio da Silva2012-08-183-1/+11
|\ \ \ | | | | | | | | | | | | | | | | brainopia/use_inversed_parent_for_first_and_last_child Use inversed parent for first and last child of has_many association
| * | | Use inversed parent for first and last child of has_many associationbrainopia2012-08-183-1/+11
| | | |
* | | | Merge pull request #7390 from ↵Rafael Mendonça França2012-08-184-5/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | aantix/add_x_content_type_options_to_default_headers Added X-Content-Type-Options to the header defaults.
| * | | | Added X-Content-Type-Options to the header defaults.Jim Jones2012-08-184-5/+9
|/ / / / | | | | | | | | | | | | With a value of "nosniff", this prevents Internet Explorer from MIME-sniffing a response away from the declared content-type.
* | | | Merge branch 'multiparameter-attributes-refactor'Carlos Antonio da Silva2012-08-182-76/+104
|\ \ \ \ | |/ / / |/| | | | | | | Refactor multiparameter attributes assignment implementation.
| * | | Get rid of some arguments by using the accessorsCarlos Antonio da Silva2012-08-181-30/+31
| | | | | | | | | | | | | | | | | | | | Cleans up a lot of noise from arguments being passed from one method to another.
| * | | Move multiparameter attribute logic to a classCarlos Antonio da Silva2012-08-181-72/+84
| | | | | | | | | | | | | | | | | | | | This should make it easier to refactor and improve this code, and remove complexity with params going around here and there.
| * | | Some more cleanup to use Hash#values_at, and some method docsCarlos Antonio da Silva2012-08-181-3/+7
| | | |
| * | | Use cached column information to instantiate time objectCarlos Antonio da Silva2012-08-181-6/+6
| | | |
| * | | Refactor blank date parameter validationCarlos Antonio da Silva2012-08-181-2/+6
| | | |
| * | | Refactor missing parameter validation based on positionCarlos Antonio da Silva2012-08-182-8/+12
| | | |
| * | | Reuse already fetched column to check for :timeCarlos Antonio da Silva2012-08-181-5/+6
| | | | | | | | | | | | | | | | | | | | Avoid doing a new column lookup for the attribute, since we already have the column to check for the klass.
| * | | Refactor some code in multiparameter assignmentCarlos Antonio da Silva2012-08-181-26/+25
| | | | | | | | | | | | | | | | | | | | Move some methods to the top to better organize them, since they're used right at the beginning of the multiparameter assignment method chain.
| * | | Extract nested parameter assignment to a separate methodCarlos Antonio da Silva2012-08-181-3/+6
|/ / /
* | | Merge pull request #6903 from guilleiguaran/dalli-memcache-storeSantiago Pastorino2012-08-175-42/+37
|\ \ \ | | | | | | | | Replace deprecated `memcache-client` gem with `dalli` in ActiveSupport::Cache::MemCacheStore
| * | | Add test to cover increment/decrement of non-existing key in MemCacheStoreGuillermo Iguaran2012-08-171-0/+2
| | | |
| * | | Replace deprecated `memcache-client` gem with `dalli` in ↵Guillermo Iguaran2012-08-175-42/+35
|/ / / | | | | | | | | | | | | | | | ActiveSupport::Cache::MemCacheStore memcache-client was deprecated in favour of dalli in 2010.
* | | Merge pull request #7380 from ↵Aaron Patterson2012-08-172-2/+21
|\ \ \ | | | | | | | | | | | | | | | | ernie/fix-nomethoderror-on-non-attribute-equalities Fix merge error when Equality LHS is non-attribute
| * | | Fix merge error when Equality LHS is non-attributeErnie Miller2012-08-172-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is at best a band-aid for a more proper fix, since it won't truly handle the removal of the previous equality condition of these other nodes. I'm planning to put in some work on ARel toward supporting that goal. Related: rails/arel#130, ernie/squeel#153, ernie/squeel#156
* | | | Merge pull request #7381 from IPGlider/masterRafael Mendonça França2012-08-171-2/+2
|\ \ \ \ | | | | | | | | | | Update to activerecord-deprecated_finders on generator
| * | | | Update to activerecord-deprecated_finders on generatorMiguel Herranz2012-08-171-2/+2
|/ / / /
* | | | Pull more serialize code into a lazy included moduleJon Leighton2012-08-171-60/+63
| | | |
* | | | don't call method unless we need toJon Leighton2012-08-171-1/+1
| | | |
* | | | align them assignmentsJon Leighton2012-08-171-4/+4
| | | |
* | | | Optimize for the happy pathJon Leighton2012-08-171-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | Checking respond_to? incurs overhead, and most of the time when assigning attributes it will return true. So just handle the NoMethodError instead.
* | | | Avoid #any?Jon Leighton2012-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | any? will check that each item in the array is truthy, as opposed to !empty? which will simply check that the array has length. For an empty array, !empty? still seems to be faster than any?
* | | | The default value can be set once in #column_defaultsJon Leighton2012-08-172-9/+16
| | | | | | | | | | | | | | | | Rather than doing it every time an instance is instantiated.
* | | | Optimize instantiation for models which don't use serializeJon Leighton2012-08-171-13/+20
| | | | | | | | | | | | | | | | Those z's were hard to type.
* | | | Avoid deep_dup when intantiating.Jon Leighton2012-08-171-2/+5
| | | | | | | | | | | | | | | | | | | | deep_dup is slow. we only need to dup the values, so just do that directly.
* | | | column default extraction should handle newlines.Aaron Patterson2012-08-172-2/+10
| | | | | | | | | | | | | | | | Fixes #7374
* | | | Merge pull request #7352 from aripollak/microsecond-timestampRafael Mendonça França2012-08-174-3/+10
|\ \ \ \ | | | | | | | | | | Fix occasional microsecond conversion inaccuracy
| * | | | Fix occasional microsecond conversion inaccuracyAri Pollak2012-08-154-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord::ConnectionAdapters::Column#microseconds did an unnecessary conversion to from Rational to float when calculating the integer number of microseconds. Some terminating decimal numbers in base10 are repeating decimal numbers in base2 (the format of float), and occasionally this causes a rounding error. Patch & explanation originally from Logan Bowers.
* | | | | Merge pull request #7373 from hollowspace/patch-1Vijay Dev2012-08-171-10/+10
|\ \ \ \ \ | | | | | | | | | | | | Fix slightly broken Markdown syntax in actionpack/CHANGELOG.md
| * | | | | Fix slightly broken Markdown syntax in actionpack/CHANGELOG.mdhollowspace2012-08-171-10/+10
| | | | | |
* | | | | | Increase benchmark time to 20 seconds.Jon Leighton2012-08-171-18/+18
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I think that 5 seconds was a bit low for our purposes. Also enable it to be configured via env vars. We also need to scale the number of records up/down depending on how long we're running the benchmark for.
* | | | | Use benchmark/ips to measure AR performanceJon Leighton2012-08-172-39/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means we can more easily compare numbers, and we don't have to specify a single N for all reports, which previously meant that some tests were running many more/fewer iterations than necessary.
* | | | | Renaming active_record_deprecated_finders to activerecord-deprecated_findersJon Leighton2012-08-177-13/+13
|/ / / / | | | | | | | | | | | | For consistency with the other AR extension plugins we are creating.
* | | | Merge pull request #7024 from bogdan/strict_validation_custom_exceptionRafael Mendonça França2012-08-165-5/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AM::Validation#validates: custom exception for :strict option Conflicts: activemodel/CHANGELOG.md
| * | | | AM::Validation#validates: ability to pass custom exception to `:strict` optionBogdan Gusiev2012-08-065-4/+32
| | | | |
* | | | | Remove the active_model require from action_dispatch.Rafael Mendonça França2012-08-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we removed the ActiveModel dependenxy from ActionPack at 166dbaa7526a96fdf046f093f25b0a134b277a68 we don't need to require it anymore. Closes #7370
* | | | | remove reference to humans.txt from release notesVijay Dev2012-08-161-2/+0
| | | | | | | | | | | | | | | | | | | | This was reverted in https://github.com/rails/rails/commit/fb883318c8b82b3570cee022ddf6886f9052245d
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-08-1620-87/+176
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | copy edits [ci skip]Vijay Dev2012-08-162-13/+13
| | | | |
| * | | | tiny formatting fix in i18n guide [ci skip]Vijay Dev2012-08-151-1/+1
| | | | |
| * | | | Minor language fix. [ci skip]Erich Menge2012-08-151-2/+2
| | | | |
| * | | | corrected grammar [ci skip]Mikhail2012-08-141-2/+2
| | | | |
| * | | | add breathing to reading sentences for flow, cut down the run-ons [ci skip]Soon Van2012-08-132-16/+16
| | | | |
| * | | | space for stack overflow; not when you get into things [ci skip]Soon Van2012-08-132-4/+4
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 15:49:50 +0000