Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Fix typos | Oscar Del Ben | 2012-07-19 | 1 | -3/+3 | |
| | | | | | | | ||||||
| * | | | | | | Fix a reference | Erich Kist | 2012-07-19 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Add nodocs to delegation module and docs for merge! | Oscar Del Ben | 2012-07-17 | 2 | -1/+2 | |
| | | | | | | | ||||||
| * | | | | | | Update batches docs | Oscar Del Ben | 2012-07-17 | 1 | -6/+6 | |
| | | | | | | | ||||||
| * | | | | | | Add nodoc to HashMerger and Merger | Oscar Del Ben | 2012-07-17 | 1 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | Fix typos and add nodocs to NullRelation | Oscar Del Ben | 2012-07-17 | 2 | -4/+4 | |
| | | | | | | | ||||||
| * | | | | | | Improve docs for AR Relation | Oscar Del Ben | 2012-07-17 | 1 | -7/+19 | |
| | | | | | | | ||||||
| * | | | | | | Add docs for Relation initialize, create and create! | Oscar Del Ben | 2012-07-16 | 1 | -1/+34 | |
| | | | | | | | ||||||
| * | | | | | | Don't link to edgeguides in docs | Oscar Del Ben | 2012-07-16 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Typo | Oscar Del Ben | 2012-07-16 | 1 | -1/+0 | |
| | | | | | | | ||||||
| * | | | | | | Add documentation for query_methods bang methods | Oscar Del Ben | 2012-07-16 | 1 | -1/+20 | |
| | | | | | | | ||||||
| * | | | | | | Add nodoc to create_with_value | Oscar Del Ben | 2012-07-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: all *_value methods are defined dynamically and so don't appear in the documentation. | |||||
| * | | | | | | Add documentation for arel and build_arel | Oscar Del Ben | 2012-07-16 | 1 | -0/+2 | |
| | | | | | | | ||||||
| * | | | | | | Add documentation for create_with | Oscar Del Ben | 2012-07-16 | 1 | -1/+19 | |
| | | | | | | | ||||||
* | | | | | | | makes a pass over the API of ActiveSupport::HashWithIndifferentAccess | Xavier Noria | 2012-07-21 | 1 | -22/+70 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Hash#fetch(fetch) is not the same as doing hash[key] | Xavier Noria | 2012-07-21 | 1 | -1/+11 | |
| | | | | | | ||||||
* | | | | | | copy-edits 9674d2c | Xavier Noria | 2012-07-21 | 1 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #7100 from shigeya/fix_mime_responds_to_doc | Xavier Noria | 2012-07-20 | 1 | -1/+2 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Clarification to doc of ActionController::MimeResponse.respond_to | |||||
| * | | | | | | Clarification to doc of ActionController::MimeResponse.respond_to | Shigeya Suzuki | 2012-07-19 | 1 | -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 test | Jon Leighton | 2012-07-20 | 3 | -12/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interpolation is no longer a thing separate from "normal" assoc conditions. | |||||
* | | | | | | | rm redundant test | Jon Leighton | 2012-07-20 | 2 | -9/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | now everything is converted to the new style, this is not needed | |||||
* | | | | | | | remove unused method | Jon Leighton | 2012-07-20 | 1 | -4/+0 | |
| | | | | | | | ||||||
* | | | | | | | remove references to :finder_sql, :counter_sql, :delete_sql, :insert_sql ↵ | Jon Leighton | 2012-07-20 | 2 | -55/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | from guides | |||||
* | | | | | | | we don't need this arg | Jon Leighton | 2012-07-20 | 1 | -2/+2 | |
| | | | | | | | ||||||
* | | | | | | | Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql. | Jon Leighton | 2012-07-20 | 15 | -339/+48 | |
| | | | | | | | ||||||
* | | | | | | | Remove obsolete line. | Jon Leighton | 2012-07-20 | 1 | -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ça | 2012-07-20 | 3 | -5/+7 | |
| | | | | | | | ||||||
* | | | | | | | Don't pass `:within` option to the i18n | Rafael Mendonça França | 2012-07-20 | 3 | -2/+24 | |
| | | | | | | | ||||||
* | | | | | | | `validates_inclusion_of` and `validates_exclusion_of` now accept | Rafael Mendonça França | 2012-07-20 | 3 | -3/+26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `:within` option as alias of `:in` as documented. Fix #7118 | |||||
* | | | | | | | Merge pull request #7099 from f1sherman/sweeper-clean-up-if-exception-raised | Rafael Mendonça França | 2012-07-20 | 2 | -2/+18 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Clean up Sweeper controller accessor when an Error is raised | |||||
| * | | | | | | | Clean up Sweeper controller accessor when an Error is raised | Brian John | 2012-07-20 | 2 | -2/+18 | |
| |/ / / / / / | ||||||
* | | | | | | | Convert association macros to the new syntax | Jon Leighton | 2012-07-20 | 16 | -135/+136 | |
| | | | | | | | ||||||
* | | | | | | | Avoid options ever being nil | Jon Leighton | 2012-07-20 | 2 | -8/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes active_record_deprecated_finders. | |||||
* | | | | | | | Merge pull request #7106 from LTe/default_separator_updated | Carlos Antonio da Silva | 2012-07-20 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use join without default separator in tagged logger | |||||
| * | | | | | | | Use join without default separator | Piotr Niełacny | 2012-07-20 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use lstrip method | |||||
* | | | | | | | | Don't assume resource param is :id when using shallow routes | Andrew White | 2012-07-20 | 2 | -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 nesting | Andrew White | 2012-07-20 | 2 | -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::Container | Aaron Patterson | 2012-07-19 | 4 | -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_plan | Rafael Mendonça França | 2012-07-19 | 2 | -2/+14 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Log query plan when we use count_by_sql method. | |||||
| * | | | | | | | | Log query plan when we use count_by_sql method. | kennyj | 2012-07-18 | 2 | -2/+14 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Create default join table name using a Symbol | Carlos Antonio da Silva | 2012-07-19 | 1 | -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 example | José Valim | 2012-07-19 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #7097 from lexmag/join_table_gen_attr | José Valim | 2012-07-18 | 5 | -8/+24 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Add fkey attributes to `join_table` migration generator | |||||
| * | | | | | | | Add fkey attributes to `join_table` migration generator | Aleksey Magusev | 2012-07-19 | 5 | -8/+24 | |
| | | | | | | | | ||||||
* | | | | | | | | Revert "Merge pull request #7084 from LTe/logger_default_separator" | Aaron Patterson | 2012-07-18 | 2 | -14/+3 | |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c08f30ff5fcda7e07cd9275a073acb2091e4b3f7, reversing changes made to e243a8a32eb4c8777f07ca4b974bd7e38d9477d3. | |||||
* | | | | | | | Merge pull request #7095 from davekaro/master | Rafael Mendonça França | 2012-07-18 | 3 | -7/+7 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | revert Default timestamps to non-null | |||||
| * | | | | | | | revert Default timestamps to non-null | Dave Kroondyk | 2012-07-18 | 3 | -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-confirm | Rafael Mendonça França | 2012-07-18 | 11 | -74/+58 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove `:confirm` in favor of `:data => { :confirm => 'Text' }` option | |||||
| * | | | | | | | Remove `:confirm` in favor of `:data => { :confirm => 'Text' }` option | Carlos Galdino | 2012-07-18 | 11 | -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_separator | José Valim | 2012-07-18 | 2 | -3/+14 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Don't use default separator in tagged logger |