aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | Add mini-profiler to performance testing, useful linksPhilipp Weißensteiner2012-08-121-1/+2
| | |
| * | Minor punctuation fix in api documentation guide [ci skip]Carlos Antonio da Silva2012-08-111-1/+1
| | |
| * | proper casing in pronouns; relocate the pro git book [ci skip]Soon Van2012-08-114-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | - Cases in point - GitHub, Git, Twitter and Rails should start with capitals when used outside code context - Pro Git found - URL has been updated for its new home - Faces for links - More descriptive titles on link prompt instead of "here"
| * | Fix caching guide (plural model name) [ci skip]Franco Catena2012-08-101-2/+2
| | |
| * | Document the namespacing of controller actions per this discussion:schneems2012-08-091-0/+11
| | | | | | | | | https://github.com/rails/journey/issues/40
| * | add around_create callback documentation for ActiveModel::Callbacksandrea longhi2012-08-081-0/+11
| | |
| * | For adding non css/js files to precompile arraylulalala2012-08-071-0/+2
| | |
| * | Update list of finder methodsOscar Del Ben2012-08-061-0/+3
| | |
| * | edit of previous contentWeston Platter2012-08-041-19/+59
| | | | | | | | | | | | | | | | | | explains how to add/override engine classes in the main rails app via 1) Class#class_eval 2) ActiveSupport::Concern
| * | Add extra documentation to the locale file.Steve Klabnik2012-08-041-2/+21
| | |
| * | Document default_options configuration in ActionMailer guide [ci skip]Dejan Simic2012-08-041-0/+2
| | |
* | | Merge pull request #7244 from lucasuyezu/masterCarlos Antonio da Silva2012-08-153-2/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix indentation on template errors to consider line number character count. For instance, when an error is shown, if the related source code snippet has line numbers from, lets say, 8-12, the lines are left aligned, which means the code indent is wrong: 8: foo 9: bar 10: raise 11: baz 12: ... This changes it to right align the source code snippet, so that the indentation is correct: 8: foo 9: bar 10: raise 11: baz 12: ...
| * | | Indentation should consider line number character count.Lucas Uyezu2012-08-133-2/+24
| | | |
* | | | Remove duplicated changelog entry [ci skip]Carlos Antonio da Silva2012-08-151-6/+0
| | | |
* | | | Move changelog entry to the top [ci skip]Carlos Antonio da Silva2012-08-151-5/+4
| | | |
* | | | Merge pull request #7133 from roshats/fix_update_all_with_blank_argumentCarlos Antonio da Silva2012-08-153-1/+11
|\ \ \ \ | | | | | | | | | | | | | | | Change Relation#update_all with blank argument to raise an ArgumentError instead of trying an update with empty fields.
| * | | | raise ArgumentError if list of attributes to change is empty in update_allRoman Shatsov2012-08-143-1/+11
| | | | |
* | | | | Add Request#formats=(extensions) that lets you set multiple formats directly ↵David Heinemeier Hansson2012-08-142-1/+36
| | | | | | | | | | | | | | | | | | | | in a prioritized order
* | | | | revises the contributing guide to document and encourage using the Rails ↵Xavier Noria2012-08-151-27/+33
| | | | | | | | | | | | | | | | | | | | development box
* | | | | Merge pull request #7349 from steveklabnik/masterRafael Mendonça França2012-08-141-3/+0
|\ \ \ \ \ | | | | | | | | | | | | No longer require AS::TestCase
| * | | | | We don't need to require AS::TestCaseSteve Klabnik2012-08-141-3/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was only needed due to https://github.com/rails/rails/blob/6591a10b1f6eccc91bc01ab708050884058e9665/railties/lib/rails/console_app.rb#L6 We don't need that on master. Fixes #6907.
* | | | | Merge pull request #7184 from anthonyalberto/xml_dasherize_includeCarlos Antonio da Silva2012-08-143-1/+43
|\ \ \ \ \ | | | | | | | | | | | | to_xml dasherize option should be passed to included associations
| * | | | | Following the false issue reporting I did here : ↵Anthony2012-08-133-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/issues/6958 - Enable propagation of :skip_types, :dasherize and :camelize on included models by default - Adding the option to override this propagation on a per-include basis (:include => { :model => { :dasherize => false } } - Enough tests to prove it works - Updated activemodel CHANGELOG.md Squashed my commits
* | | | | | Some release notes love :heart:Rafael Mendonça França2012-08-141-0/+31
|/ / / / /
* | | | | Merge branch 'concerns'Rafael Mendonça França2012-08-136-30/+232
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add CHANGELOG entry and documentation for Routing ConcernsRafael Mendonça França2012-08-133-0/+98
| | | | |
| * | | | Extract common controllers to abstract_unitRafael Mendonça França2012-08-133-45/+33
| | | | |
| * | | | Implementing Routing ConcernsRafael Mendonça França2012-08-132-1/+117
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | This pattern was introduced as a plugin by @dhh. The original implementation can be found in https://github.com/rails/routing_concerns
* | | | oops, should be directoryAaron Patterson2012-08-131-1/+1
| | | |