aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Refactored common date and time calculations.Pan Thomakos2012-08-047-848/+433
| | | | | | | | * Added the `DateAndTime::Calculations` module that is included in Time and Date. It houses common calculations to reduce duplicated code. * Simplified and cleaned-up the calculation code. * Removed duplication in tests by adding a behavior module for shared tests. I also added some missing tests.
* Revert "polymorphic_url with an array generates a query string"Andrew White2012-08-042-18/+1
| | | | | Passing options as the last value in an array doesn't work with form_for. This reverts commit 61c8a4d926343903593a27080216af7e4ed81268.
* Revert "Refactor passing url options via array for polymorphic_url"Andrew White2012-08-043-11/+2
| | | | | Passing options as the last value in an array doesn't work with form_for. This reverts commit 6be564c7a087773cb0b51c54396cc190e4f5c983.
* Merge pull request #7262 from bogdan/refator_route_setSantiago Pastorino2012-08-044-25/+14
|\ | | | | Refator route set
| * RouteSet: cleanup some unneeded compexityBogdan Gusiev2012-08-041-16/+7
| |
| * Renamed _path_segments to _recallBogdan Gusiev2012-08-044-5/+5
| |
| * Simplify logical statementBogdan Gusiev2012-08-041-4/+2
| |
* | Merge pull request #7202 from asanghi/perform_deliveries_in_mailJosé Valim2012-08-043-3/+16
|\ \ | |/ |/| Allow perform_deliveries to be set within mailer action
| * allow perform deliveries to be set within mailer actionAditya Sanghi2012-07-303-3/+16
| |
* | Merge branch 'polymorphic_url_builds_query_string_with_array'Andrew White2012-08-043-1/+27
|\ \
| * | Refactor passing url options via array for polymorphic_urlAndrew White2012-08-043-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | Rather than keep the url options in record_or_hash_or_array, extract it and reverse merge with options as it may contain important private keys like `:routing_type`. Closes #7259
| * | polymorphic_url with an array generates a query stringRomain Tribes2012-08-042-1/+18
| | | | | | | | | | | | | | | Generating an URL with an array of records is now able to build a query string if the last item of the array is a hash.
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-08-0431-424/+1147
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: activemodel/lib/active_model/secure_password.rb activerecord/lib/active_record/associations/collection_proxy.rb
| * | | copy edits [ci skip]Vijay Dev2012-08-044-10/+4
| | | |
| * | | Revert "Fix string interpolation in belongs_to docs"Vijay Dev2012-08-041-1/+1
| | | | | | | | | | | | | | | | This reverts commit 3fb0100ef893b8cf229e82ce264b426e0c961eb1.
| * | | Corrected info about asset pipeline default pathsAndrew Vit2012-08-041-4/+6
| | | |
| * | | added info about an error that mysql gives when rails@localhost has a ↵Ace Suares2012-08-031-1/+3
| | | | | | | | | | | | | | | | password; removed reference to activerecord/test/connections, which isn't there anymore
| * | | Update guides/source/asset_pipeline.textileMikhail Dieterle2012-08-031-1/+1
| | | |
| * | | Fix ActiveModel::Serializers::Xml#to_xml referenceRobert Pankowecki2012-08-021-1/+1
| | | | | | | | | | | | | | | | Link to ActiveRecord::Serialization#to_xml for more details
| * | | Audit the usage of the word "JavaScript"Prem Sichanugrist2012-08-025-5/+5
| | | |
| * | | fixed wrong route for creating new post [ci skip]Mikhail Dieterle2012-08-021-9/+9
| | | | | | | | | | | | Now there is error ```No route matches [POST] “/posts”```
| * | | Fix string interpolation in belongs_to docsFranco Catena2012-08-011-1/+1
| | | |
| * | | fix punctuation in #resources and #match documentation [ci skip]Francesco Rodriguez2012-07-311-4/+4
| | | |
| * | | Update #match documentation [ci skip]Robert Pankowecki2012-07-311-0/+4
| | | |
| * | | Update #resources documentation [ci skip]Robert Pankowecki2012-07-311-0/+4
| | | |
| * | | update ActiveModel::Observer documentation [ci skip]Francesco Rodriguez2012-07-311-21/+32
| | | |
| * | | Fix a mistake in the I18n guide: English => Spanish [ci skip]David Celis2012-07-311-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: David Celis <david@davidcelis.com>
| * | | Update I18n guide with details on multilingual Inflector [ci skip]David Celis2012-07-311-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Sorry; I forgot about the guides when I submitted this patch. Signed-off-by: David Celis <david@davidcelis.com>
| * | | fix ActiveRecord::Associations::CollectionProxy documentationAccessd2012-07-311-1/+1
| | | |
| * | | update ActiveModel::ObserverArray documentation [ci skip]Francesco Rodriguez2012-07-301-3/+4
| | | |
| * | | add :nodoc: to ActiveModel::Observing#inherited [ci skip]Francesco Rodriguez2012-07-301-1/+1
| | | |
| * | | update ActiveModel::Observing documentation [ci skip]Francesco Rodriguez2012-07-301-25/+125
| | | |
| * | | update ActiveModel::Serializers documentation [ci skip]Francesco Rodriguez2012-07-302-14/+40
| | | |
| * | | add documentation to ActiveModel #from_json method [ci skip]Francesco Rodriguez2012-07-301-2/+34
| | | |
| * | | Add 'Writing Rake Tasks' subsection to Command Line GuideNovikov Andrey2012-07-311-0/+47
| | | |
| * | | fix #after_validation example [ci skip]Francesco Rodriguez2012-07-301-1/+1
| | | |
| * | | add mysql authentification command to chapter 2.Running the Test SuiteVladimir Strakhov2012-07-301-0/+4
| | | |
| * | | update AR::Validations::AssociatedValidator documentation [ci skip]Francesco Rodriguez2012-07-291-13/+19
| | | |
| * | | update AR::Validations::UniquenessValidator documentation [ci skip]Francesco Rodriguez2012-07-291-31/+45
| | | |
| * | | add :nodoc: directives to ActiveModel Sanitizers [ci skip]Francesco Rodriguez2012-07-291-4/+4
| | | |
| * | | fix class reference in AM::MassAssignmentSecurity documentation [ci skip]Francesco Rodriguez2012-07-291-3/+3
| | | |
| * | | update ActiveModel::Validations::Callbacks documentation [ci skip]Francesco Rodriguez2012-07-291-18/+69
| | | |
| * | | update #validates and #validates! documentation [ci skip]Francesco Rodriguez2012-07-291-31/+43
| | | |
| * | | update ActiveModel::Valdations#validates_with docs [ci skip]Francesco Rodriguez2012-07-291-16/+18
| | | |
| * | | update ActiveModel::Validations docs [ci skip]Francesco Rodriguez2012-07-292-36/+127
| | | |
| * | | update ActiveModel::Validator docs [ci skip]Francesco Rodriguez2012-07-292-11/+11
| | | |
| * | | update ActiveModel::SecurePassword docs [ci skip]Francesco Rodriguez2012-07-291-18/+38
| | | |
| * | | add example to ActiveModel::StrictValidationFailed [ci skip]Francesco Rodriguez2012-07-281-0/+13
| | | |
| * | | add example to ActiveModel::MissingAttributeError [ci skip]Francesco Rodriguez2012-07-281-0/+8
| | | |
| * | | update ActiveModel::MassAssignmentSecurity docs [ci skip]Francesco Rodriguez2012-07-281-65/+177
| | | |