aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #7130 from kennyj/fix_restoring_query_cacheRafael Mendonça França2012-07-222-4/+22
|\ \ \ \ \ | | | | | | | | | | | | Restore connection_id on error.
| * | | | | Restore connection_id on error.kennyj2012-07-232-4/+22
| | | | | |
* | | | | | Merge pull request #7123 from nashby/data-in-optionsRafael Mendonça França2012-07-222-8/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | | don't escape options in option_html_attributes method
| * | | | | don't escape options in option_html_attributes methodVasiliy Ermolovich2012-07-222-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we don't need to escape values in this method as we pass these html attributes to `tag_options` method that handle escaping as well. it fixes the case when we want to pass html5 data options
* | | | | | Merge pull request #7126 from frodsan/fix_nodoc_encodingRafael Mendonça França2012-07-211-15/+48
|\ \ \ \ \ \ | | | | | | | | | | | | | | fixing :nodoc:s in AS::JSON::Encoding
| * | | | | | fixing :nodoc:s in AS::JSON::EncodingFrancesco Rodriguez2012-07-211-15/+48
|/ / / / / /
* | | | | | Remove deprecation warningsCarlos Galdino + Rafael Mendonça França2012-07-212-2/+2
| | | | | |
* | | | | | Add back `:disable_with` and change deprecation horizon to 4.1Carlos Galdino + Rafael Mendonça França2012-07-215-5/+74
| | | | | |
* | | | | | Add back `:confirm` and change deprecation horizon to 4.1Carlos Galdino + Rafael Mendonça França2012-07-215-2/+144
| | | | | |
* | | | | | +"foo"+ doesn't generate code tag [ci skip]Rafael Mendonça França2012-07-211-1/+1
| | | | | |
* | | | | | Lets be consistent with whitespaces at documentationRafael Mendonça França2012-07-211-13/+13
| | | | | |
* | | | | | Copy-edits at Rails::Queueing documentationRafael Mendonça França2012-07-211-2/+2
| | | | | |
* | | | | | update 4.0 release notes [ci skip]Vijay Dev2012-07-211-0/+2
| | | | | |
* | | | | | 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
| |/ / / / / /