aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fix ActiveSupport integration with Mocha > 0.12.1Mike Gunderloy2012-08-021-1/+3
| | | | | | | | | | | | Mocha 0.12.2 renames the Integration module to MonkeyPatching. This breaks the code Rails uses to retrieve the assertion counter from Mocha.
* | Merge pull request #7299 from iHiD/3-2-stable-storeRafael Mendonça França2012-08-095-2/+22
|\ \ | | | | | | | | | Ported PR #4856 to 3-2-stable.
| * | Add CHANGELOG entryRafael Mendonça França2012-08-091-0/+5
| | |
| * | Backport #7173.Jeremy Walker2012-08-091-2/+4
| | |
| * | Ported PR #4856 to 3-2-stable.Jeremy Walker2012-08-094-2/+15
|/ /
* | Fix CHANGELOG [ci skip]Rafael Mendonça França2012-08-081-1/+4
| |
* | Remove references to old behavior with headers atRafael Mendonça França2012-08-071-4/+3
| | | | | | | | | | | | | | | | | | | | | | ActionDispatch::Integration::ResquestHelpers. The behavior has removed at 4a6f4b92ad2f48dc7906d223fe4708d36624bd50 to increase the compatibility with Rack::Test Closes #7136 [ci skip]
* | Merge pull request #7284 from josh/fix-asset-testsRafael Mendonça França2012-08-071-3/+2
|\ \ | | | | | | Fix asset integration test (3-2-stable)
| * | Fix invalid asset compile assertionsJoshua Peek2012-08-071-3/+2
|/ / | | | | | | Logical paths to compile should require an extension
* | make assertions easier to track downAaron Patterson2012-08-071-9/+17
| |
* | Merge pull request #7283 from josh/bump-sprocketsDavid Heinemeier Hansson2012-08-071-1/+1
|\ \ | | | | | | Allow newer versions of Sprockets
| * | Loosen sprockets version restrictionJoshua Peek2012-08-071-1/+1
|/ /
* | Add CHANGELOG entry for a935c7aRafael Mendonça França2012-08-061-0/+5
| |
* | Merge pull request #5872 from evtuhovich/prepared_statement_fixAaron Patterson2012-08-061-10/+10
| | | | | | | | | | | | Remove prepared statement from system query in postgresql adapter Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
* | Merge pull request #7167 from route/missed_extendJosé Valim2012-08-061-0/+1
| | | | | | | | | | | | | | Missed extend for eager_autoload This backport is trying to fix a bug with eager load ActiveRecord::Associations modules
* | Merge pull request #7276 from sikachu/3-2-stable-js-include-tag-fixRafael Mendonça França2012-08-063-7/+19
|\ \ | | | | | | Do not include application.js if it doesn't exists
| * | Rearrange example output of javascript_include_tagPrem Sichanugrist2012-08-061-2/+2
| | |
| * | Do not include application.js if it doesn't existsPrem Sichanugrist2012-08-063-5/+17
|/ / | | | | | | | | | | Rails were including 'application.js' to the pack when using `javascript_include_tag :all` even there's no application.js in the public directory.
* | Merge pull request #7140 from seamusabshere/patch-1Rafael Mendonça França2012-08-052-2/+10
| | | | | | | | | | | | | | | | Make sure :environment task is executed before db:schema:load or db:structure:load Conflicts: activerecord/CHANGELOG.md
* | Revert "Merge pull request #6084 from ↵Rafael Mendonça França2012-08-052-14/+0
| | | | | | | | | | | | | | | | brainopia/support_for_magic_domain_on_all_stores" This reverts commit 393c652cf63875f2728c04d47b34b2d6ae908186. This commit was supposed to fix a bug but it add more failures.
* | Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_storesJosé Valim2012-08-022-0/+14
| | | | | | | | Support cookie jar options for all cookie stores
* | More `:rails_env` cleanup.Rafael Mendonça França2012-08-021-6/+6
| | | | | | | | `Rails.env` already use development if ENV["RAILS_ENV"] is not present.
* | Fix html_escape with Ruby 1.8Rafael Mendonça França2012-08-021-15/+26
| |
* | html_escape should escape single quotesSantiago Pastorino2012-08-0212-63/+51
| | | | | | | | | | | | | | | | | | | | | | | | https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content Closes #7215 Conflicts: actionpack/test/template/erb_util_test.rb actionpack/test/template/form_tag_helper_test.rb actionpack/test/template/text_helper_test.rb actionpack/test/template/url_helper_test.rb activesupport/lib/active_support/core_ext/string/output_safety.rb
* | Use `:data => { :confirm => "Text" }` syntax instead of `:confirm` atRafael Mendonça França2012-08-022-4/+9
| | | | | | | | | | | | | | the ERB scaffold generator. We are trying to teach the data attributes as best practices and `:confirm` will be deprecated in 4.0.
* | Do not consider the numeric attribute as changed if the old value isRafael Mendonça França2012-08-023-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zero and the new value is not a string. Before this commit this was the behavior r = Review.find_by_issue(0) r.issue => 0 r.changes => {} r.issue = 0 => 0 r.changed? => true r.changes => {"issue"=>[0,0]} Fixes #7237
* | Merge pull request #7232 from kennyj/fix_7200Carlos Antonio da Silva2012-08-022-1/+6
|\ \ | | | | | | Fix #7200. Backport #5168 to 3-2-stable
| * | Backport #5168 to 3-2-stable. Fix a problem that NULLS is ignored by ↵kennyj2012-08-022-1/+6
| | | | | | | | | | | | postgresql_adapter.rb while creating distincts.
* | | Merge pull request #7235 from ffmike/mocha_12_2_compatCarlos Antonio da Silva2012-08-021-1/+3
|\| | | |/ |/| Fix ActiveSupport integration with Mocha > 0.12.1
| * Fix ActiveSupport integration with Mocha > 0.12.1Mike Gunderloy2012-08-021-1/+3
|/ | | | | | Mocha 0.12.2 renames the Integration module to MonkeyPatching. This breaks the code Rails uses to retrieve the assertion counter from Mocha.
* This entry is wrongSantiago Pastorino2012-08-011-2/+0
|
* Bump to 3.2.8.rc1Santiago Pastorino2012-08-019-17/+17
|
* Revert "Deprecate link_to_function and button_to_function helpers"Rafael Mendonça França2012-08-013-28/+16
| | | | This reverts commit 9dc57fe9c4807fc0ad4b1590a931891d9faa3164.
* Revert "Deprecate `:mouseover` options for `image_tag` helper."Rafael Mendonça França2012-08-013-42/+10
| | | | | | | This reverts commit 1aff7725c7a04cde202cca906208560a55409e6a. Conflicts: actionpack/CHANGELOG.md
* Revert "Deprecate ActiveSupport::JSON::Variable"Rafael Mendonça França2012-08-013-23/+14
| | | | This reverts commit bcfa013399fd2c5b5d25c38912cba3560de1cc57.
* Fix CHANGELOGSRafael Mendonça França2012-08-012-14/+38
|
* removes the deprecation of update_attributeXavier Noria2012-08-012-3/+2
| | | | Applying the new policy here to not deprecate stuff in point releases.
* revises the deprecation warning of update_attributeXavier Noria2012-08-012-2/+2
| | | | | | | We have decided not to drop this important method in 4.0 and give it a longer deprecation cycle. On the other hand we do not expect to have update_column around for a long time, it is going to be replaced in favor of update_columns.
* Revert "Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` ↵Rafael Mendonça França2012-08-018-188/+63
| | | | | | | | | | | option" Revert "Deprecate `:disable_with` in favor of `'data-disable-with'` option for `button_to` and `submit_tag` helpers." This reverts commit fc092a9cba5fceec38358072e50e09250cf58840. This reverts commit e9051e20aeb2c666db06b6217954737665878db7. This reverts commit d47d6e7eda3aa3e6aa28d0c17ac6801234bb97d1. This reverts commit 21141e777bdce8534e3755c8de7268324b3d8714.
* Revert "Deprecating composed_of in ActiveRecord"Rafael Mendonça França2012-08-015-24/+7
| | | | This reverts commit 44b313bc4e3762da64dde7894548f81c595147de.
* Revert "Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql."Jon Leighton2012-08-018-97/+38
| | | | | | | | | | This reverts commit a79bfa92e7bdc31b346d13ee5447d3fdac382bfb. Conflicts: activerecord/CHANGELOG.md We shouldn't introducing deprecations in point releases. It will be deprecated in 4.0 instead.
* Add missing CHANGELOG entriesSantiago Pastorino2012-08-017-10/+41
| | | | [ci skip]
* Merge pull request #7070 from jmazzi/3-2-stableRafael Mendonça França2012-08-011-3/+6
|\ | | | | Update documentation for Rails::Application#env_config
| * Update documentation for Rails::Application#env_configJustin Mazzi2012-07-161-3/+6
| |
* | Merge pull request #7147 from pferdefleisch/scaffold_controller_docsRafael Mendonça França2012-07-311-4/+3
| | | | | | | | Updated scaffold_controller generator docs #7146
* | Add CHANGELOG entry [ci skip]Rafael Mendonça França2012-07-311-0/+8
| |
* | Revert "Add update_columns and the suggestion of using update_columnsRafael Mendonça França2012-07-304-78/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of update_column" This reverts commit 9fa06c3d9811113259cb6e00a3a8454b3974add7. This reverts commit 17a64de4980683da3ca3c185205013a29a8cf88d. This reverts commit def9c85ffbdcf63e6c412b6bd4abafaa32ccdb5c, reversing changes made to 6b7d26cf3c061907aedc44f7f36776c9b36950fd. Reason: This was supposed to be released with 3.2.7 before the suggestion to use update_column. Since it was not release now is not good to suggest to use another method because it will confusing the people.
* | removes the AR session store from eager loaded code [fixes #7160]Xavier Noria2012-07-291-1/+10
| | | | | | | | | | See the comment in the file activerecord/lib/active_record.rb added by this patch for the rationale.
* | Merge pull request #7187 from frodsan/fix_test_helpRafael Mendonça França2012-07-281-2/+2
|\ \ | | | | | | Backport #6995 to 3-2 stable
| * | Backport #6995 to 3-2 stableFrancesco Rodriguez2012-07-281-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | Update `test_help` to config properly turn natural language option. Last versions of Turn don't monkey patch MiniTest to setup the natural language option. Here is an [example](https://github.com/TwP/turn/blob/master/try/test_autorun_minitest.rb#L3). This patches the following behaviour: $ rake test:units `<top (required)>': undefined method `use_natural_language_case_names=' for MiniTest::Unit:Class (NoMethodError)
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-23 00:44:13 +0000