aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-10-2152-482/+674
| |\ | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/slice.rb guides/source/active_support_core_extensions.md
| | * copy edits [ci skip]Vijay Dev2012-10-211-14/+7
| | |
| | * minor edits in AM documentation [ci skip]Francesco Rodriguez2012-10-2122-32/+32
| | |
| | * update AR::AttributeMethods documentation [ci skip]Francesco Rodriguez2012-10-211-23/+124
| | |
| | * nodoc AR::Generators [ci skip]Francesco Rodriguez2012-10-204-10/+10
| | |
| | * Hash Syntax changes to 1.9 formatAvnerCohen2012-10-205-9/+9
| | |
| * | Merge pull request #7493 from steveklabnik/ajax_guideXavier Noria2012-10-212-316/+392
| |\ \ | | | | | | | | Re-writing the AJAX Guide
| | * | Working With JavaScript guide.Steve Klabnik2012-10-142-316/+392
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally, this guide was called "AJAX on Rails," but really, it's not just about AJAX. This was never finished, but it got accidentally generated and Google found out about it. In the meantime, all the guides were converted to markdown, as well. So here's a new guide. It covers all of the built-in helpers that use ajax requests, it covers CoffeeScript, and it covers UJS.
| * | | Rotate the debug.log on each 100MBRafael Mendonça França2012-10-201-1/+1
| | | |
| * | | Merge pull request #8002 from nashby/checkbox-includeRafael Mendonça França2012-10-202-3/+11
| |\ \ \ | | | | | | | | | | check_box value can be not only an object of Array class
| | * | | check_box value can be not only an object of Array classVasiliy Ermolovich2012-10-202-3/+11
| | | | | | | | | | | | | | | | | | | | there is a chance that `value` is a Set or an object that reponses to `include?` method so let's handle this case
| * | | | Revert "Get rid of the ActiveRecord::Model::DeprecationProxy thing."Jeremy Kemper2012-10-2015-28/+88
| | | | | | | | | | | | | | | | | | | | This reverts commit 83846838252397b3781eed165ca301e05db39293.
| * | | | Merge pull request #7951 from Grandrath/patch-1Carlos Antonio da Silva2012-10-201-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | Use `Rails.env` instead of `ENV['RAILS_ENV']`. Fix behavior of `rake db:structure:load`.
| | * | | Don't use test environment by default when running rake db:structure:load; #7951Martin Grandrath2012-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | `ENV['RAILS_ENV']` is not defined unless explicitly specified on the command line when running `rake db:structure:load`.
| * | | | We don't need this anymore since we had a sprockets-rails releaseRafael Mendonça França2012-10-191-3/+0
| | | | |
| * | | | Merge pull request #7995 from adimichele/masterRafael Mendonça França2012-10-192-1/+10
| |\ \ \ \ | | | | | | | | | | | | Small change to active_record/locale/en.yml
| | * | | | Changed scope for "taken" error message translation to decrease precedenceAndrew DiMichele2012-10-192-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved activerecord.errors.messages.taken to errors.messages.taken so that translations for, e.g., errors.attributes.email.taken don't get overridden. Test that the translation for 'taken' can be overridden
| * | | | | Merge pull request #7997 from steveklabnik/issue_733Rafael Mendonça França2012-10-192-11/+24
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add i18n scope to disance_of_time_in_words.
| | * | | | | Add i18n scope to disance_of_time_in_words.Steve Klabnik2012-10-192-11/+24
| | |/ / / / | | | | | | | | | | | | | | | | | | This fixes #733.
| * | | | | Merge pull request #7996 from yahonda/revert_7994Rafael Mendonça França2012-10-191-2/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "truncate debug.log on each test run" I'm reverting this since we may want to see SQL results of subsequent tests run, to, per example, copare them. I didn't realized this first time but @yahonda pointed me out.
| | * | | | Revert "truncate debug.log on each test run"Yasuo Honda2012-10-201-2/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 98043c689f945cabffc043f4bdc80ab2a7edc763. Because if every time `debug.log` is truncated, developers have no way to see the previous ActiveRecord unit test results. `debug.log` file can be easily reduced by executing `$ touch /dev/null > debug.log` periodically.
| * | | | Merge pull request #7994 from frodsan/truncate_debug_logRafael Mendonça França2012-10-191-1/+2
| |\ \ \ \ | | | | | | | | | | | | truncate debug.log on each test run
| | * | | | truncate debug.log on each test runFrancesco Rodriguez2012-10-191-1/+2
| | | | | |
| * | | | | Get rid of the ActiveRecord::Model::DeprecationProxy thing.Jon Leighton2012-10-1915-88/+28
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I think it's going to be too much pain to try to transition the :active_record load hook from executing against Base to executing against Model. For example, after Model is included in Base, and modules included in Model will no longer get added to the ancestors of Base. So plugins which wish to be compatible with both Model and Base should use the :active_record_model load hook which executes *before* Base gets loaded. In general, ActiveRecord::Model is an advanced feature at the moment and probably most people will continue to inherit from ActiveRecord::Base for the time being.
| * | | | Update rails gemspec to use sprockets-rails 2.0.0.rc1Carlos Antonio da Silva2012-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | So that we can bundle and travis can run our tests.
| * | | | Rename the partial_updates config to partial_writesJon Leighton2012-10-195-23/+53
| | | | | | | | | | | | | | | | | | | | This reflects the fact that it now impact inserts as well as updates.
| * | | | nodoc the first_or_create methods and document alternativesJon Leighton2012-10-194-68/+50
| | | | |
| * | | | fix test :/Jon Leighton2012-10-191-5/+1
| | | | |
| * | | | The default value of a text/blob in mysql strict mode should be nilJon Leighton2012-10-196-48/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In non-strict mode it is '', but if someone is in strict mode then we should honour the strict semantics. Also, this removes the need for a completely horrible hack in dirty.rb. Closes #7780
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 11:23:39 +0000