aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* * Do not convert digest auth strings to symbols. CVE-2012-3424Aaron Patterson2012-07-261-2/+2
| | | | | Conflicts: actionpack/lib/action_controller/metal/http_authentication.rb
* Merge pull request #7171 from beerlington/refactor_inheritance_base_classRafael Mendonça França2012-07-263-30/+45
|\ | | | | Refactor ActiveRecord::Inheritance.base_class logic
| * Refactor ActiveRecord::Inheritance.base_class logicbeerlington2012-07-263-30/+45
| | | | | | | | | | | | | | | | | | Moved logic from class_of_active_record_descendant(class) to the base_class method. This method was confusing because it required an argument, but that argument was 'self'. Moved base_class tests to inheritance_test.rb and added some test coverage for some untested cases.
* | Merge pull request #7170 from makaroni4/masterRafael Mendonça França2012-07-262-2/+2
|\ \ | |/ |/| Fix typo in documentation
| * fix typo in documentationAnatoly Makarevich2012-07-262-2/+2
|/
* Merge pull request #7167 from route/missed_extendJosé Valim2012-07-261-0/+1
|\ | | | | Missed extend for eager_autoload
| * Missed extend for eager_autoloadDmitry Vorotilin2012-07-261-0/+1
|/
* Merge pull request #7166 from ayrton/patch-1Jon Leighton2012-07-261-13/+13
|\ | | | | Update activerecord/CHANGELOG.md
| * Update activerecord/CHANGELOG.mdAyrton De Craene2012-07-261-13/+13
| | | | | | Fixed markdown code indenting
* | Merge pull request #7161 from ↵Jon Leighton2012-07-261-5/+7
|\ \ | |/ |/| | | | | michaelfairley/eager_load_active_record_association_helpers Eager autoload ActiveRecord association helpers
| * Eager autoload ActiveRecord association helpersMichael Fairley2012-07-251-5/+7
| |
* | Merge pull request #7165 from parndt/patch-5Rafael Mendonça França2012-07-251-1/+1
|\ \ | | | | | | Switched update_column recommendation in changelog to update_columns
| * | Switched update_column recommendation in changelog to update_columnsPhilip Arndt2012-07-261-1/+1
|/ / | | | | | | | | Related to #7164 Looks like the last one; thanks!
* | Merge pull request #6654 from stevecj/postgresql-auto-reconnect-2Aaron Patterson2012-07-253-1/+76
|\ \ | | | | | | Postgresql auto reconnect 2
| * | Stop being silly with formatting of method aliasing.Steve Jorgensen2012-07-161-3/+3
| | |
| * | Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests.Steve Jorgensen2012-07-163-0/+75
| | |
| * | Don't crash exception translation w/ nil result attribute.Steve Jorgensen2012-07-161-1/+1
| | | | | | | | | | | | | | | | | | Exception.result is nil when attempting a query after PostgreSQL disconnect, resulting in new exception: NoMethodError: undefined method `error_field' for nil:NilClass
* | | Merge pull request #7158 from yahonda/use_string_for_settingsRafael Mendonça França2012-07-251-1/+1
|\ \ \ | | | | | | | | Use string datatype for the setting attribute
| * | | Use string datatype for the setting attributeYasuo Honda2012-07-261-1/+1
|/ / / | | | | | | | | | to make store works all database adapters.
* | | Merge pull request #7151 from graceliu/travis-rm-dup-runCarlos Antonio da Silva2012-07-241-3/+0
|\ \ \ | | | | | | | | remove duplicate build runs in travis
| * | | remove duplicate build runs in travis. These extra runs were used toGrace Liu2012-07-241-3/+0
|/ / / | | | | | | | | | test identity map and not fully removed when the feature was removed.
* | | Merge branch 'update_columns'Rafael Mendonça França2012-07-2416-63/+212
|\ \ \
| * | | Deprecate update_column in favor of update_columns.Rafael Mendonça França2012-07-2415-47/+85
| | | | | | | | | | | | | | | | Closes #1190
| * | | 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
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 14:25:27 +0000