aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #10659 from vipulnsward/normalize_param2Rafael Mendonça França2013-05-191-3/+3
|\ \ \ \ | | | | | | | | | | "normalize_callback_params" doesn't require name param
| * | | | "normalize_callback_params" doesn't require name paramVipul A M2013-05-171-3/+3
| | |/ / | |/| |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-1914-25/+77
|\ \ \ \
| * | | | copy edits[ci skip]Vijay Dev2013-05-193-15/+10
| | | | |
| * | | | Revert "Corrected documentation and added some more for the classify method ↵Vijay Dev2013-05-191-14/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in inflectors" This reverts commit 8f901dee9e2072dd20e0a252a89dd501d783d85b.
| * | | | Revert "Changed the CHANGELOG for active_support and improved the doc for ↵Vijay Dev2013-05-192-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inflector method classify" This reverts commit 8d5fcb691e7496900f1c77dff8d6e729c1b56201. Reason: Changelogs are not to be edited in docrails. [ci skip]
| * | | | Revert "ActionMailer::Collector should be nodoc'd"Vijay Dev2013-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e47c85c696de1c4137c222bedc846b2cdbb0893f. Reason: Let's not nodoc without reason. [ci skip]
| * | | | Revert "nodoc ActionMailer module from lib/action_mailer/*.rb"Vijay Dev2013-05-199-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 328e876a1569058e47eaf7ea3f4f045a83b585fa. Reason: Let's not nodoc without reason. [ci skip]
| * | | | Revert "Document Rails::Generators::MailerGenerator"Vijay Dev2013-05-191-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit dfb69f2b8a85586ad70071baba416747cbb07364. Reason: Let's not nodoc without reason. [ci skip]
| * | | | Changed the CHANGELOG for active_support and improved the doc for inflector ↵aditya-kapoor2013-05-192-8/+9
| | | | | | | | | | | | | | | | | | | | method classify
| * | | | Fix documentation for ActionMailer template names.Megan Bowra-Dean2013-05-171-4/+4
| | | | | | | | | | | | | | | | | | | | ActionMailer templates that are not plain text do not require *.text.* in the name and will fail to be picked up automatically if it is included in the name.
| * | | | Merge pull request #137 from zduci/masterRadu Busuioc2013-05-161-7/+7
| |\ \ \ \ | | | | | | | | | | | | Corrected documentation regarding validation errors
| | * | | | Corrected documentation regarding validation errorsRadu Busuioc2013-05-161-7/+7
| |/ / / /
| * | | | Corrected documentation and added some more for the classify method in ↵aditya-kapoor2013-05-161-5/+14
| | | | | | | | | | | | | | | | | | | | inflectors
| * | | | Added some more documentation for define_readers and define_writer of the ↵aditya-kapoor2013-05-153-0/+15
| | | | | | | | | | | | | | | | | | | | Association and its inherited classes
| * | | | Added some more documentation for ↵aditya-kapoor2013-05-151-0/+11
| | | | | | | | | | | | | | | | | | | | ActiveRecord::Associations::Builder::Association class
| * | | | Added documentation for ActiveRecord::Associations::Builder::Association classaditya-kapoor2013-05-151-0/+4
| | | | |
| * | | | Document Rails::Generators::MailerGeneratorZachary Scott2013-05-151-2/+4
| | | | |
| * | | | nodoc ActionMailer module from lib/action_mailer/*.rbZachary Scott2013-05-159-9/+9
| | | | |
| * | | | Document ActionMailer::MailHelperZachary Scott2013-05-151-0/+3
| | | | |
| * | | | Document ActionMailer::LogSubscriber and ↵Zachary Scott2013-05-152-0/+6
| | | | | | | | | | | | | | | | | | | | ActionMailer::DeliveryMethods::ClassMethods
| * | | | ActionMailer::Collector should be nodoc'dZachary Scott2013-05-151-1/+1
| | | | |
| * | | | Use new hash syntaxMikhail Dieterle2013-05-141-2/+2
| | | | |
| * | | | improved doc for ActiveRecord#find_by_sql method (Refs #10599) [ci skip]Anton Kalyaev2013-05-141-3/+4
| | | | |
| * | | | Added documentation for model migration generationaditya-kapoor2013-05-141-0/+4
| | | | |
| * | | | Added documentation for Rails::Generators::NamedBase.templateaditya-kapoor2013-05-141-0/+4
| | | | |
| * | | | fix grammarAdam Konner2013-05-131-2/+2
| | | | |
| * | | | emphasize that callbacks are called in destroy_allNeeraj Singh2013-05-132-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaned up rdoc a bit emphasizing that callbacks are called. Also removed the stress on the fact that records are always removed. If callbacks return false then records will not be deleted.
| * | | | Document ActionMailer::Base#set_content_typeZachary Scott2013-05-121-0/+9
| | | | |
* | | | | Merge pull request #10678 from prathamesh-sonpatki/typosCarlos Antonio da Silva2013-05-183-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Fixed some typos
| * | | | | Fxied some typosPrathamesh Sonpatki2013-05-183-3/+3
| | | | | |
* | | | | | Merge pull request #10597 from steveklabnik/patch_documentationSteve Klabnik2013-05-181-0/+53
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Adding notes on PATCH to the upgrade guide. [ci skip]
| * | | | | Adding notes on PATCH to the upgrade guide.Steve Klabnik2013-05-131-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discusses compatibility between PATCH and PUT, as well as how to add support for JSON PATCH to your application. Fixes #10439.
* | | | | | Merge pull request #10676 from tkhr/add-test-to-counter_cache_test.rbRafael Mendonça França2013-05-185-4/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add test to counter cache test.rb
| * | | | | | Fix tests which started to fail due to commit ↵Takehiro Adachi2013-05-182-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0123c39f41e2062311b2197e6e230ef8ad67e20e Due to commit 0123c39f41e2062311b2197e6e230ef8ad67e20e, column topic.unique_replies_count has been added, and these test started to fail since the tests depends on the topic tables column info.
| * | | | | | Add test to AR's counter_cache_test.rbTakehiro Adachi2013-05-183-0/+14
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to https://github.com/rails/rails/blob/b601399b72ab56cc01368f02615af99f45d1 4f02/activerecord/lib/active_record/counter_cache.rb#L14, u can pass more then one association to the `reset_counters` method.
* | | | | | Merge pull request #10675 from prathamesh-sonpatki/dont-auto-require-mochaRafael Mendonça França2013-05-181-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't autorequire mocha to avoid deprecation warnings
| * | | | | | Don't autorequire mocha to avoid deprecation warningsPrathamesh Sonpatki2013-05-181-1/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - https://travis-ci.org/rails/rails/jobs/7264822 contains deprecated warnings given by Mocha version 0.14 - 632f215da added Mocha 0.14 to Gemfile - But with the version, require: false was removed - So Mocha started giving deprecation warnings - Acc.to Mocha documentation(https://github.com/freerange/mocha#bundler) it should not be auto required.
* | | | | | stop swallowing exceptions in assert_queries. Methods that raise anAaron Patterson2013-05-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exception are unlikely to pass this assertion, but since the assertions raise an exception, the original exception is lost.
* | | | | | Merge pull request #10672 from carllerche/masterSantiago Pastorino2013-05-172-0/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | Bug fix: Evented notification subscribers can handle published events
| * | | | | | Bug fix: Evented notification subscribers can handle published eventsCarl Lerche2013-05-172-0/+29
|/ / / / / /
* | | | | | stop doing assingments in an iteratorAaron Patterson2013-05-171-2/+6
| | | | | |
* | | | | | include bind values from the default scopeAaron Patterson2013-05-172-6/+5
|/ / / / /
* | | | | Merge pull request #10657 from AJ-Acevedo/pluginRafael Mendonça França2013-05-161-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | plugin new missing license spec
| * | | | plugin new missing license specAJ Acevedo2013-05-161-0/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When bundling a gem created with rails plugin new Bundler outputs the following warning when building the gem: WARNING: licenses is empty modified: railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
* | | | let Ruby do the is_a check for usAaron Patterson2013-05-161-3/+4
| | | |
* | | | Merge pull request #10656 from zenspider/fix_mocha_backAaron Patterson2013-05-161-1/+1
|\ \ \ \ | | | | | | | | | | Mocha 0.14.0 was released with MT5 support. Switch back to gem
| * | | | Mocha 0.14.0 was released with MT5 support. Switch back to gemRyan Davis2013-05-161-1/+1
|/ / / /
* | | | Fix named routing regression from 3.2.13schneems2013-05-162-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When named route that is nested is used in 3.2.13 Example `routes.rb`: ``` resources :nested do resources :builder, :controller => 'nested/builder' end ``` In 3.2.12 and 3.2.12 this named route would work: ``` nested_builder_path(:last_step, :nested_id => "foo") ``` Generating a url that looks like `/nested/foo/builder/last_step`. This PR fixes the regression when building urls via the optimized helper. Any explicit keys set in the options are removed from the list of implicitly mapped keys. Not sure if this is exactly how the original version worked, but this fixes this use case regression.
* | | | Revert "just call the class method since we know the callbacks are stored at ↵Aaron Patterson2013-05-161-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | the" This reverts commit 55975c71ec9c2c18b67020484959ff5c69d4d3fb.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 00:19:59 +0000