Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | show routes while debugging added to changelog | schneems | 2012-07-07 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | move route_inspector to actionpack | @schneems and @mattt | 2012-07-07 | 6 | -10/+304 | |
| | | | | | | | | | | | | | | | | this is so we can show route output in the development when we get a routing error. Railties can use features of ActionDispatch, but ActionDispatch should not depend on Railties. | |||||
| * | | | show routes while debugging RoutingError | schneems | 2012-07-07 | 2 | -3/+20 | |
|/ / / | | | | | | | | | | If someone receives a routing error, they likely need to view the routes. Rather than making them visit '/rails/info/routes' or run `rake routes` we can give them that information on the page. | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-07-07 | 20 | -176/+258 | |
|\ \ \ | ||||||
| * | | | minor text change [ci skip] | Vijay Dev | 2012-07-07 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Revert "Add nodoc to relation methods" | Vijay Dev | 2012-07-07 | 1 | -22/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c47a698d5d497340d4e349257522212173865838. Reason: Let's revert pending further discussions | |||||
| * | | | Add nodoc to relation methods | Oscar Del Ben | 2012-07-06 | 1 | -24/+22 | |
| | | | | ||||||
| * | | | add :nodoc: to internal implementations of AM::Validator [ci skip] | Francesco Rodriguez | 2012-07-06 | 2 | -3/+3 | |
| | | | | ||||||
| * | | | update ActiveModel::Serialization documentation [ci skip] | Francesco Rodriguez | 2012-07-06 | 1 | -14/+36 | |
| | | | | ||||||
| * | | | Add order docs | Oscar Del Ben | 2012-07-05 | 1 | -0/+10 | |
| | | | | ||||||
| * | | | Add group documentation | Oscar Del Ben | 2012-07-05 | 1 | -0/+12 | |
| | | | | ||||||
| * | | | Add documentation for includes | Oscar Del Ben | 2012-07-05 | 1 | -0/+11 | |
| | | | | ||||||
| * | | | Update list of AR Relation methods | Oscar Del Ben | 2012-07-05 | 1 | -10/+16 | |
| | | | | ||||||
| * | | | Bump query guide to latest version | Oscar Del Ben | 2012-07-05 | 1 | -2/+0 | |
| | | | | ||||||
| * | | | fix syntax of AM::Validations::HelperMethods examples [ci skip] | Francesco Rodriguez | 2012-07-05 | 4 | -6/+6 | |
| | | | | ||||||
| * | | | update ActiveModel::Validations::HelperMethods documentation [ci skip] | Francesco Rodriguez | 2012-07-05 | 8 | -130/+141 | |
| | | | | ||||||
| * | | | update ActiveModel::Conversion documentation [ci skip] | Francesco Rodriguez | 2012-07-04 | 1 | -3/+15 | |
| | | | | ||||||
| * | | | There is only task for installing migrations when using engines | Wojciech Wnętrzak | 2012-07-04 | 1 | -2/+1 | |
| | | | | ||||||
| * | | | remove :nodoc: of AR::Scoping#unscoped [ci skip] | Francesco Rodriguez | 2012-07-01 | 1 | -4/+4 | |
| | | | | ||||||
| * | | | Changed attr_accessible example to reflect grouped roles | Laknath | 2012-07-01 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | Related to the request #5699 - https://github.com/rails/rails/pull/5699 and not documented. | |||||
| * | | | ActionDispatch::ClosedError no longer is raised. See d142572567 for more info. | Nick Howard | 2012-06-30 | 1 | -3/+0 | |
| | | | | ||||||
| * | | | use config.action_controller instead of ActionController::Base in example ↵ | Nick Howard | 2012-06-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | code for asset_tag_helper | |||||
| * | | | fix AR::SchemaStatements#column_exists? example [ci skip] | Francesco Rodriguez | 2012-06-30 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | update AR::SchemaStatements#column_exists? documentation [ci skip] | Francesco Rodriguez | 2012-06-30 | 1 | -2/+4 | |
| | | | | ||||||
* | | | | Refactor locked? method in query cache | Carlos Antonio da Silva | 2012-07-07 | 1 | -5/+2 | |
| | | | | | | | | | | | | | | | | Introduced in 75b340d1a4bcf2f1233fb65a15ff6b8059e2230e | |||||
* | | | | Load all records in Relation#inspect | Jon Leighton | 2012-07-07 | 1 | -4/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A test was failing due to the way that Relation#inspect causes association proxies to ignore unsaved records added to the association. This is fixed by simply calling to_a and letting to_a figure out how to get the records (which, in the case of associations, takes into account new records). I think it is acceptable to do this rather than limiting the query at the database level: * It's what we've done in all released Rails versions up to this point * The goal of the limit is to not flood the console with output - this is the problem we're targeting, rather than the actual loading of the records from the database * You probably want to do something with those records later anyway, otherwise you wouldn't have built a relation for them. | |||||
* | | | | Merge pull request #6938 from acapilleri/as_json_refactoring | Carlos Antonio da Silva | 2012-07-07 | 1 | -2/+6 | |
|\ \ \ \ | | | | | | | | | | | Small refactoring of as_json method | |||||
| * | | | | small refactoring of as_json method | Angelo Capilleri | 2012-07-03 | 1 | -2/+6 | |
| | | | | | | | | | | | | | | | | | | | | with this change root has always one assignment | |||||
* | | | | | Merge pull request #6838 from kennyj/added_registration_task | Carlos Antonio da Silva | 2012-07-07 | 2 | -7/+27 | |
|\ \ \ \ \ | | | | | | | | | | | | | Allow to register database tasks from different adapters | |||||
| * | | | | | Added a feature to add a database task. e.g. OracleDatabaseTasks | kennyj | 2012-06-24 | 2 | -7/+27 | |
| | | | | | | ||||||
* | | | | | | Use "instance_accessor" for flash types class attribute | Carlos Antonio da Silva | 2012-07-07 | 2 | -4/+3 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | fixup changelog | Jon Leighton | 2012-07-07 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Relation#inspect handles doesn't perform a new query on an already-loaded ↵ | Jon Leighton | 2012-07-07 | 2 | -2/+16 | |
| | | | | | | | | | | | | | | | | | | | | relation | |||||
* | | | | | Simplify Relation#inspect | Jon Leighton | 2012-07-07 | 1 | -12/+3 | |
| | | | | | ||||||
* | | | | | Merge pull request #6992 from kennyj/improve_6977-2 | José Valim | 2012-07-07 | 4 | -14/+65 | |
|\ \ \ \ \ | | | | | | | | | | | | | Allow people to register their own flash types. | |||||
| * | | | | | Added support add_flash_types | kennyj | 2012-07-07 | 4 | -14/+65 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #6993 from morgoth/engine-table-name-prefix-generator-fix | José Valim | 2012-07-07 | 3 | -2/+14 | |
|\ \ \ \ \ | | | | | | | | | | | | | Engine table name prefix generator fix | |||||
| * | | | | | Fixed generating namespaced table_name_prefix in engines | Wojciech Wnętrzak | 2012-07-06 | 2 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Added failing test for generating namespaced table_name_prefix in engines | Wojciech Wnętrzak | 2012-07-06 | 1 | -0/+12 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #6996 from kennyj/remove_unused_code_20120707 | José Valim | 2012-07-07 | 1 | -4/+0 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove unused code. | |||||
| * | | | | | | Remove unused code. | kennyj | 2012-07-07 | 1 | -4/+0 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #6997 from kennyj/fix_stored_attributes | José Valim | 2012-07-07 | 4 | -2/+16 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Added *instance_writer: false* to stored/serialized attributes. | |||||
| * | | | | | | | Added *instance_writer: false* for stored/serialized attributes. | kennyj | 2012-07-07 | 4 | -2/+16 | |
| |/ / / / / / | ||||||
* | | | | | | | Update master | José Valim | 2012-07-07 | 1 | -0/+2 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #6987 from dmathieu/limit_inspect | José Valim | 2012-07-07 | 3 | -3/+22 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Limit the number of records in Relation#inspect | |||||
| * | | | | | | Limit the number of records in Relation#inspect | Damien Mathieu | 2012-07-06 | 3 | -3/+22 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | While it's interesting to have the results array, it can make a console or a webpage freeze if there are a lot of them. So this limits the number of records displayed in #inspect to 10 and tells how much were effectively found. | |||||
* | | | | | | Fix failing AM test due to missing template | Carlos Antonio da Silva | 2012-07-06 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Improve docs, changelog and release notes for Action Mailer default_options= | Carlos Antonio da Silva | 2012-07-06 | 4 | -6/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | | Merge pull request #6950 from paneq/default_from2 | Carlos Antonio da Silva | 2012-07-06 | 4 | -3/+21 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce config.action_mailer.default_options= Allows to easily set :from, :replay_to, etc. options in config/application.rb using simple syntax: config.action_mailer.default_options = { from: "no-replay@example.org" } Closes #6747 | |||||
| * | | | | | | Introduce config.action_mailer.default_from= | Robert Pankowecki | 2012-07-03 | 4 | -3/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows to easily set :from, :replay_to, etc. options in config/application.rb using simple syntax: config.action_mailer.default_options = {from:"no-replay@example.org"} This was not possible using #default method because config.action_mailer.default(from: "no-replay@example.org") is interpreated as reader method and just returns nil. It would not call ActionMailer::Base.default method. The only way of calling this method from config/application.rb was to use the direct syntax which looks ugly in my opinion: config.assets.enabled = false config.assets.version = '1.0' config.encoding = "utf-8" config.action_mailer.default_url_options= { host:"example.org", protocol:"https" } ActionMailer::Base.default(from: "no-replay@example.org") |