aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | 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
| | | | | | | |
* | | | | | | | Merge pull request #7097 from lexmag/join_table_gen_attrJosé Valim2012-07-185-8/+24
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Add fkey attributes to `join_table` migration generator
| * | | | | | | Add fkey attributes to `join_table` migration generatorAleksey Magusev2012-07-195-8/+24
| | | | | | | |
* | | | | | | | Revert "Merge pull request #7084 from LTe/logger_default_separator"Aaron Patterson2012-07-182-14/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c08f30ff5fcda7e07cd9275a073acb2091e4b3f7, reversing changes made to e243a8a32eb4c8777f07ca4b974bd7e38d9477d3.
* | | | | | | Merge pull request #7095 from davekaro/masterRafael Mendonça França2012-07-183-7/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | revert Default timestamps to non-null
| * | | | | | | revert Default timestamps to non-nullDave Kroondyk2012-07-183-7/+7
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 3dbedd2 added NOT NULL constraints to timestamps. Commit fcef728 started to revert this, but was incomplete. With this commit, 3dbedd2 should be fully reverted and timestamps will no longer default to NOT NULL.
* | | | | | | Merge pull request #6614 from carlosgaldino/data-confirmRafael Mendonça França2012-07-1811-74/+58
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove `:confirm` in favor of `:data => { :confirm => 'Text' }` option
| * | | | | | | Remove `:confirm` in favor of `:data => { :confirm => 'Text' }` optionCarlos Galdino2012-07-1811-74/+58
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This applies to the following helpers: `button_to` `button_tag` `image_submit_tag` `link_to` `submit_tag`
* | | | | | | Merge pull request #7084 from LTe/logger_default_separatorJosé Valim2012-07-182-3/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Don't use default separator in tagged logger