aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use update_columns to implemente the update_columnRafael Mendonça França2012-07-242-19/+54
|
* New #update_columns method.Sebastian Martinez2012-07-243-0/+76
|
* Merge pull request #7148 from yahonda/address_6195Rafael Mendonça França2012-07-241-1/+1
|\ | | | | Addresses ORA-01400 errors and also supports #6115
| * This pull requests addresses ORA-01400 errors and also supports #6115 issue ↵Yasuo Honda2012-07-251-1/+1
| | | | | | | | | | | | | | | | | | tested. Issue #6115 has been fixed and tested with the attribute `:null => false, :default => ""` However `:null => false` attribute is not necessary to test this issue, which causes many ORA-01400 errors with Oracle enhanced adapter.
* | Merge pull request #7150 from lucasmazza/flush_optionRafael Mendonça França2012-07-242-13/+13
|\ \ | | | | | | Replace the flush parameter with a Hash.
| * | Replace the flush parameter with a Hash.Lucas Mazza2012-07-242-13/+13
|/ /
* | Merge pull request #6991 from frodsan/performance_test_generatorRafael Mendonça França2012-07-242-2/+2
|\ \ | |/ |/| update performance test template to use test method
| * update performance test template to use test methodFrancesco Rodriguez2012-07-062-2/+2
| |
* | Merge pull request #7143 from accessd/fix-typo-callbacks-testSantiago Pastorino2012-07-241-2/+2
|\ \ | | | | | | fix typo in validations callbacks test
| * | fix typo in callbacks testAccessd2012-07-241-2/+2
|/ /
* | Add CHANGELOG entrySantiago Pastorino2012-07-231-0/+2
| |
* | Remove ActionDispatch::Head middleware in favor of Rack::HeadSantiago Pastorino2012-07-237-32/+12
| | | | | | | | Closes #7110 there's more work to do on rack-cache issue 69
* | Merge pull request #7137 from kennyj/fix_installing_problem_journeyRafael Mendonça França2012-07-231-1/+1
|\ \ | | | | | | Fix build. There is journey-1.0.4 on the 1-0-stable branch.
| * | Fix build. Bump Journey requirements to 2.0.0.kennyj2012-07-241-1/+1
|/ /
* | Bump Journey requirements to 1.0.4Andrew White2012-07-231-1/+1
| | | | | | | | | | There are some Action Pack tests for regressions from 3.1 that require a later version of Journey to pass so bump to the current version.
* | Add one more test case to make sure that data attributes are beingRafael Mendonça França2012-07-221-0/+7
| | | | | | | | escaped
* | 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
| |/ / |/| |