aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #6390 from ernie/invalid-ruby18-syntax-in-habtmRafael Mendonça França2012-05-181-2/+2
|\ \ | | | | | | Invalid ruby18 syntax in habtm
| * | Fix HABTM syntax error in Ruby 1.8.xErnie Miller2012-05-181-2/+2
|/ /
* | fix #delete_all with habtm with :delete_sqlJon Leighton2012-05-182-0/+7
| |
* | Perf: Don't load the association for #delete_all.Jon Leighton2012-05-186-9/+48
| | | | | | | | | | | | | | | | Bug #6289 Conflicts: activerecord/test/cases/associations/has_many_associations_test.rb
* | Merge pull request #6377 from ihid/depreciate_old_text_helper_apisRafael Mendonça França2012-05-183-36/+56
|\ \ | | | | | | Deprecate old APIs for highlight, excerpt and word_wrap
| * | Deprecate old APIs for highlight, excerpt and word_wrapJeremy Walker2012-05-183-36/+56
|/ /
* | Merge pull request #6367 from frodsan/fix_validators_docsVijay Dev2012-05-179-116/+154
|\ \ | | | | | | Fix validators docs [3-2-stable]
| * | fix validations docsFrancesco Rodriguez2012-05-179-116/+154
|/ /
* | Fix CollectionAssociation#replace to return new target (closes #6231)Piotr Sarnacki2012-05-162-0/+14
| | | | | | | | | | | | Conflicts: activerecord/test/cases/associations/has_many_associations_test.rb
* | Merge pull request #6340 from bcardarella/patch-3Aaron Patterson2012-05-161-1/+1
|\ \ | | | | | | Changing the indentation level of the block comment close for Sass
| * | Changing the indentation level of the block comment close for SASS Brian Cardarella2012-05-151-1/+1
|/ / | | | | If one wants to use use SASS for application.css.sass the comment block indentation is invalid.
* | Merge pull request #6329 from acapilleri/backport_dup_validation_3_2Rafael Mendonça França2012-05-151-1/+9
|\ \ | | | | | | Backport dup validation 3 2
| * | add backport for the pull request #6324Angelo Capilleri2012-05-151-1/+9
|/ /
* | Fix indent from previous mergeCarlos Antonio da Silva2012-05-151-2/+2
| |
* | Merge pull request #6324 from acapilleri/dup_validation_3_2Rafael Mendonça França2012-05-152-0/+21
|\ \ | | | | | | Dup validation 3 2
| * | clean the errors if an object that includes validations errors is duped,for ↵Angelo capilleri2012-05-152-0/+21
|/ / | | | | | | | | | | 3-2-stable It Fixes #5953 in 3-2-stable, it's the same pull request of #6284
* | Merge pull request #6321 from frodsan/backport_docsVijay Dev2012-05-153-4/+23
|\ \ | | | | | | Backporting docs
| * | Backporting some docs on core_ext/hashFrancesco Rodriguez2012-05-153-4/+23
|/ /
* | Deprecate `:disable_with` for `button_tag` tooCarlos Galdino + Rafael Mendonça França2012-05-145-9/+20
| |
* | Fix typoCarlos Galdino + Rafael Mendonça França2012-05-143-10/+10
| |
* | Deprecate `:disable_with` in favor of `'data-disable-with'` option for ↵Carlos Galdino + Rafael Mendonça França2012-05-145-31/+54
| | | | | | | | `button_to` and `submit_tag` helpers.
* | Merge pull request #6018 from lest/patch-1Carlos Antonio da Silva2012-05-143-1/+16
| | | | | | | | mailer can be anonymous
* | Default escape_html_entities_in_json to true in new appsJosé Valim2012-05-141-2/+2
| |
* | Update railties/lib/rails/generators/rails/app/templates/config/application.rbEgor Homakov2012-05-141-0/+3
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Merge pull request #6266 from alexeymuranov/remove_unused_private_methodCarlos Antonio da Silva2012-05-131-3/+0
|\ \ | | | | | | Remove unused private method
| * | Remove unused private method yaml_fixtures_keyAlexey Muranov2012-05-111-3/+0
| | |
* | | Deprecate `:mouseover` options for `image_tag` helper.Rafael Mendonça França2012-05-133-8/+44
| | |
* | | Merge pull request #3237 from sakuro/data-url-schemeRafael Mendonça França2012-05-133-3/+4
| | | | | | | | | | | | Support data: url scheme
* | | Merge pull request #6306 from erichmenge/3-2-stable-guide-fixCarlos Antonio da Silva2012-05-131-2/+2
|\ \ \ | | | | | | | | 3 2 stable guide fix [ci skip]
| * | | :foreign_key option should be on has_many side of associationMikhail Dieterle2012-05-131-2/+2
| | | |
* | | | Merge pull request #6299 from guilleiguaran/upgrade-sprockets-3-2-stableSantiago Pastorino2012-05-131-1/+1
|\ \ \ \ | |/ / / |/| | | Upgrade sprockets to 2.1.3
| * | | Upgrade sprockets to 2.1.3Guillermo Iguaran2012-05-131-1/+1
|/ / /
* | | Merge pull request #6294 from frodsan/docs_backportVijay Dev2012-05-123-1/+22
|\ \ \ | | | | | | | | Adding examples and docs [3-2-stable]
| * | | adding examples and docsFrancesco Rodriguez2012-05-123-1/+22
|/ / /
* | | Merge pull request #6292 from erichmenge/3-2-stable-docfixRafael Mendonça França2012-05-121-1/+16
|\ \ \ | | | | | | | | 3 2 stable guides fix
| * | | Update 'getting started' guides for new whitelist security implementation. ↵Erich Menge2012-05-121-1/+16
|/ / / | | | | | | | | | Closes #6286.
* | | Merge pull request #6262 from arunagw/ruby_prof_fixSantiago Pastorino2012-05-112-2/+2
|\ \ \ | |/ / |/| | Ruby prof fix
| * | Ruby-Prof works with ruby-1.9.3 also.Arun Agrawal2012-05-111-1/+1
| | |
| * | Update performance profiler to work with latest ruby-profArun Agrawal2012-05-112-2/+2
|/ / | | | | | | Thanks to @carlosantoniodasilva
* | Return false for exists? with new records - fixes #6199.Andrew White2012-05-103-2/+3
| | | | | | | | (cherry picked from commit fa21b73ebb8339ad388f149c817c433b6254d490)
* | Don't ignore nil positional arguments for url helpers - fixes #6196.Andrew White2012-05-102-1/+35
| |
* | Refactor the handling of default_url_options in integration testsAndrew White2012-05-102-7/+104
| | | | | | | | | | | | | | | | | | | | | | | | This commit improves the handling of default_url_options in integration tests by making behave closer to how a real application operates. Specifically the following issues have been addressed: * Options specified in routes.rb are used (fixes #546) * Options specified in controllers are used * Request parameters are recalled correctly * Tests can override default_url_options directly
* | Merge pull request #6230 from spectator/active_resource_exceptionsJeremy Kemper2012-05-102-1/+1
|\ \ | | | | | | ActiveResource::TimeoutError is not loaded
| * | Make sure TimeoutError is loaded.Yury Velikanau2012-05-102-1/+1
| | |
* | | Merge pull request #6221 from ↵Jeremy Kemper2012-05-091-7/+26
|\ \ \ | | | | | | | | | | | | | | | | alexeymuranov/deprecate__instantiate_fixtures__arity Deprecate ActiveRecord::Fixtures.instantiate_fixtures unused parameter
| * | | Remove deprecated use of ::instantiate_fixturesAlexey Muranov2012-05-101-4/+4
| | | |
| * | | Deprecate ::instantiate_fixtures unused parameterAlexey Muranov2012-05-101-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | Deprecate the use of AcitiveRecord::Fixtures::instantiate_fixtures(object, fixture_set_name, fixture_set, load_instances = true), use instead instantiate_fixtures(object, fixture_set, load_instances = true). To be changed in master branch.
* | | | Merge pull request #6149 from jmbejar/javascript_include_tag_with_not_duplicatesSantiago Pastorino2012-05-092-2/+8
|\ \ \ \ | |_|/ / |/| | | Make sure that javascript_include_tag/stylesheet_link_tag methods don't consider duplicated assets
| * | | Make sure that javascript_include_tag/stylesheet_link_tag methods inJorge Bejar2012-05-032-2/+8
| | | | | | | | | | | | | | | | sprockets/helpers/rails_helper.rb discard duplicated assets
* | | | Merge pull request #6219 from frodsan/fix_buildPiotr Sarnacki2012-05-091-1/+9
|\ \ \ \ | | | | | | | | | | Fix build - 3.2
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 14:37:04 +0000