aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* tiny mistake in descriptiondm1try2012-07-221-1/+1
|
* add :nodoc: directive to AM::ObserverArray internal methods [ci skip]Francesco Rodriguez2012-07-221-10/+10
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-07-217-27/+108
|\
| * improve NullRelation docs [ci skip]Vijay Dev2012-07-212-5/+4
| |
| * minor copy edits [ci skip]Vijay Dev2012-07-212-4/+2
| |
| * Revert "Make it clear that you can also pass a full url to assert_routing."Vijay Dev2012-07-211-3/+0
| | | | | | | | This reverts commit 5a6f30ff0f11f6d685d2601a60700784e3555b8b.
| * Revert "Fix a reference"Xavier Noria2012-07-211-1/+1
| | | | | | | | | | | | | | | | The sentence itself was not exact, [] and fetch are different. Reverting in docrails because it has been reworded in master and 3-2-stable,see 98f4aee8dac22d9e9bb3c122b43e9e5ee8ba7d1c. This reverts commit 69879667dcf4494915f1b9d826f17856bff11887.
| * Make it clear that you can also pass a full url to assert_routing.Sytse Sijbrandij2012-07-201-0/+3
| |
| * Fix typosOscar Del Ben2012-07-191-3/+3
| |
| * Fix a referenceErich Kist2012-07-191-1/+1
| |
| * Add nodocs to delegation module and docs for merge!Oscar Del Ben2012-07-172-1/+2
| |
| * Update batches docsOscar Del Ben2012-07-171-6/+6
| |
| * Add nodoc to HashMerger and MergerOscar Del Ben2012-07-171-2/+2
| |
| * Fix typos and add nodocs to NullRelationOscar Del Ben2012-07-172-4/+4
| |
| * Improve docs for AR RelationOscar Del Ben2012-07-171-7/+19
| |
| * Add docs for Relation initialize, create and create!Oscar Del Ben2012-07-161-1/+34
| |
| * Don't link to edgeguides in docsOscar Del Ben2012-07-161-1/+1
| |
| * TypoOscar Del Ben2012-07-161-1/+0
| |
| * Add documentation for query_methods bang methodsOscar Del Ben2012-07-161-1/+20
| |
| * Add nodoc to create_with_valueOscar Del Ben2012-07-161-1/+1
| | | | | | | | | | Reason: all *_value methods are defined dynamically and so don't appear in the documentation.
| * Add documentation for arel and build_arelOscar Del Ben2012-07-161-0/+2
| |
| * Add documentation for create_withOscar Del Ben2012-07-161-1/+19
| |
* | makes a pass over the API of ActiveSupport::HashWithIndifferentAccessXavier Noria2012-07-211-22/+70
| |
* | Hash#fetch(fetch) is not the same as doing hash[key]Xavier Noria2012-07-211-1/+11
| |
* | copy-edits 9674d2cXavier Noria2012-07-211-2/+2
| |
* | Merge pull request #7100 from shigeya/fix_mime_responds_to_docXavier Noria2012-07-201-1/+2
|\ \ | | | | | | Clarification to doc of ActionController::MimeResponse.respond_to
| * | Clarification to doc of ActionController::MimeResponse.respond_toShigeya Suzuki2012-07-191-1/+2
| | | | | | | | | | | | | | | - #respond_to's documentation refer to .respond_to, but it was written as just <respond_to>. Added class name for clarification.
* | | rm unnecessary testJon Leighton2012-07-203-12/+0
| | | | | | | | | | | | | | | interpolation is no longer a thing separate from "normal" assoc conditions.
* | | rm redundant testJon Leighton2012-07-202-9/+0
| | | | | | | | | | | | now everything is converted to the new style, this is not needed
* | | remove unused methodJon Leighton2012-07-201-4/+0
| | |
* | | remove references to :finder_sql, :counter_sql, :delete_sql, :insert_sql ↵Jon Leighton2012-07-202-55/+1
| | | | | | | | | | | | from guides
* | | we don't need this argJon Leighton2012-07-201-2/+2
| | |
* | | Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql.Jon Leighton2012-07-2015-339/+48
| | |
* | | Remove obsolete line.Jon Leighton2012-07-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | This code is broken (it should say association_scope.uniq_value rather than options[:uniq]) but the tests still pass. I think it is designed to uniq-ify associations using finder_sql. However, I am about to remove that anyway.
* | | Update documentation and change the range method name to delimiter.Rafael Mendonça França2012-07-203-5/+7
| | |
* | | Don't pass `:within` option to the i18nRafael Mendonça França2012-07-203-2/+24
| | |
* | | `validates_inclusion_of` and `validates_exclusion_of` now acceptRafael Mendonça França2012-07-203-3/+26
| | | | | | | | | | | | | | | | | | `:within` option as alias of `:in` as documented. Fix #7118
* | | Merge pull request #7099 from f1sherman/sweeper-clean-up-if-exception-raisedRafael Mendonça França2012-07-202-2/+18
|\ \ \ | | | | | | | | Clean up Sweeper controller accessor when an Error is raised
| * | | Clean up Sweeper controller accessor when an Error is raisedBrian John2012-07-202-2/+18
| |/ /
* | | Convert association macros to the new syntaxJon Leighton2012-07-2016-135/+136
| | |
* | | Avoid options ever being nilJon Leighton2012-07-202-8/+8
| | | | | | | | | | | | This fixes active_record_deprecated_finders.
* | | Merge pull request #7106 from LTe/default_separator_updatedCarlos Antonio da Silva2012-07-201-2/+2
|\ \ \ | | | | | | | | Use join without default separator in tagged logger
| * | | Use join without default separatorPiotr Niełacny2012-07-201-2/+2
| | | | | | | | | | | | | | | | Use lstrip method
* | | | Don't assume resource param is :id when using shallow routesAndrew White2012-07-202-1/+15
| | | | | | | | | | | | | | | | | | | | Since #5581 added support for resources with custom params we should not assume that it is :id when using shallow resource routing.
* | | | Support constraints on resource custom params when nestingAndrew White2012-07-202-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The Mapper looks for a :id constraint in the scope to see whether it should apply a constraint for nested resources. Since #5581 added support for resource params other than :id, we need to check for a constraint on the parent resource's param name and not assume it's :id.
* | | | adding Rails::Queueing::ContainerAaron Patterson2012-07-194-6/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to do: In your configuration: Rails.queue[:image_queue] = SomeQueue.new Rails.queue[:mail_queue] = SomeQueue.new In your app code: Rails.queue[:mail_queue].push MailJob.new Both jobs pushed to the same default queue Rails.queue.push DefaultJob.new Rails.queue[:default].push DefaultJob.new
* | | | Merge pull request #7078 from kennyj/logging_query_planRafael Mendonça França2012-07-192-2/+14
|\ \ \ \ | | | | | | | | | | Log query plan when we use count_by_sql method.
| * | | | Log query plan when we use count_by_sql method.kennyj2012-07-182-2/+14
| | | | |
* | | | | Create default join table name using a SymbolCarlos Antonio da Silva2012-07-191-1/+1
| |/ / / |/| | | | | | | | | | | | | | | Lets stick with a symbol in join table name, it was removed in 993e1643650b7b0939437f86b7b4cda0d92b0b8f and broke the build.
* | | | Use attributes instead of table names in migration exampleJosé Valim2012-07-191-1/+1
| | | |