aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Backport #5808Mack Earnhardt2013-03-243-6/+60
| | | | | | df36c5f - Fix assert_template assertion with :layout option 4bd05a7 - Fix assert_template :layout => nil assertion 0d19a08 - Improve assert_template layout checking
* Merge pull request #9873 from senny/use_old_hash_syntaxJon Leighton2013-03-221-1/+1
|\ | | | | use ruby 1.8 Hash syntax [ci skip]
| * use ruby 1.8 Hash syntax [ci skip]Yves Senn2013-03-221-1/+1
|/
* Merge pull request #9870 from senny/9806_eager_loading_regressionJon Leighton2013-03-222-2/+8
|\ | | | | do not reset associations when preloading twice.
| * do not reset associations when preloading twice.Yves Senn2013-03-222-2/+8
|/ | | | | | | | Closes #9806. As the `through_options` always contained `{:order=>nil}` the second time, the preloader ran, the association was always reset. This patch only adds the `:order` to the `through_options` if it is set.
* Fix test to Ruby 1.8Rafael Mendonça França2013-03-211-1/+1
| | | | Pathname doesn't respond to to_path
* Improve CHANGELOG entry [ci skip]Rafael Mendonça França2013-03-211-1/+5
|
* Merge branch '3-2-stable' into fredwu-slow_view_loading_fixAaron Patterson2013-03-206-2/+32
|\ | | | | | | | | | | | | | | | | | | | | * 3-2-stable: Merge pull request #9802 from newsline/fix-broken-action-missing Remove bad changelog entry from AR [ci skip] Wrong exception is occured when raising no translatable exception Don't crash exception translation w/ nil result attribute. Conflicts: actionpack/CHANGELOG.md
| * Merge pull request #9802 from newsline/fix-broken-action-missingRafael Mendonça França2013-03-203-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | Fix missing action_missing Conflicts: actionpack/CHANGELOG.md Conflicts: actionpack/test/controller/base_test.rb Fixes #9799
| * Remove bad changelog entry from AR [ci skip]Carlos Antonio da Silva2013-03-201-3/+0
| | | | | | | | Introduced in dc2bc388bc8c6c345337052bf0d60f5243d899d4.
| * Wrong exception is occured when raising no translatable exceptionkennyj2013-03-203-0/+16
| | | | | | | | | | Conflicts: activerecord/CHANGELOG.md
| * Don't crash exception translation w/ nil result attribute.Steve Jorgensen2013-03-201-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
* | Added changelog for 687e68dFred Wu2013-03-211-0/+6
| |
* | Fixed assets loading performance in 3.2.13Fred Wu2013-03-202-1/+10
|/ | | | | The PR #8756 uses Sprockets for resolving files that already exists on disk, for those files their extensions don't need to be rewritten. Fixes #9803
* Be consistent with quotes in smtp example guide [ci skip]Carlos Antonio da Silva2013-03-191-1/+1
|
* Merge pull request #9796 from dembskoi/clone_structureRafael Mendonça França2013-03-192-0/+8
|\ | | | | Reset postgreSQL search path in db:test:clone_structure.
| * Reset postgreSQL search path in db:test:clone_structure.Alexander2013-03-192-0/+8
| | | | | | | | | | | | | | | | This patch resets the postgres search path in the structure.sql after the structure is dumped in order to find schema_migrations table when multiples schemas are used. Fixes #945
* | Merge pull request #9804 from samsonasu/backport_number_to_human_fixesRafael Mendonça França2013-03-193-1/+20
|\ \ | |/ |/| Backport #9347 to rails 3.2
| * Backport #9347 to rails 3.2hoffm2013-03-193-1/+20
|/
* Merge pull request #9789 from puma/3-2-stableJosé Valim2013-03-181-1/+1
|\ | | | | Change @env_config to @app_env_config
| * Change @env_config to @app_env_configEvan Phoenix2013-03-181-1/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moral of the story: One must be careful about lazily initializing instance variables when subclassing. I would like to draw your attention to https://github.com/rails/rails/issues/4652 where the reader will see that there appears to be some kind of initialization issue in rails. The source of this issue is that: 1) Engine#env_config contains "@env_config ||= ..." 2) Application#env_config contains "@env_config ||= ..." 3) Threads are in the picture 4) Thread A calls Application#env_config, which super's to Engine#env_config 5) After Engine#env_config returns but before Application#env_config sets @env_config again, Thread B begins running 6) Thread B calls Application#env_config 7) Thread B finds @env_config to contain a value (the one set by Engine#env_config) and returns it 8) Thread B blows up because key set by Application#env_config are there. 9) People report bugs with puma, thin, rainbows, webrick, etc 10) Evan becomes tired of seeing these bugs 11) Evan pours himself a stiff drink, puts on Top Gear(tm), and begins debugging 12) Evan finds the source of the bug 13) Evan authors a PR 14) RIGHT NOW. The bug is fixed by simply using a different ivar name in the methods. Alternately, Engine#env_config could just return a new Hash each time, not memoizing into @env_config. I bid you adieu.
* Merge pull request #9785 from claudiob/add-3-2-13-release-date-to-changelogsRafael Mendonça França2013-03-187-8/+8
|\ | | | | Add release dates to documentation [ci skip]
| * Add release dates to documentation [ci skip]claudiob2013-03-187-8/+8
|/ | | | Set "March 18, 2013" as the release date for 3.2.13
* Bring back test and changelog entry from #pluck method and select clauseCarlos Antonio da Silva2013-03-182-0/+16
|
* Fix method name indent [ci skip]Carlos Antonio da Silva2013-03-181-1/+1
|
* Fix changelog conflicts and remove release dates [ci skip]Carlos Antonio da Silva2013-03-183-14/+8
|
* Merge branch '3-2-13' into 3-2-stableAaron Patterson2013-03-1828-50/+98
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-13: bumping to 3.2.13 fix protocol checking in sanitization [CVE-2013-1857] JDOM XXE Protection [CVE-2013-1856] fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] stop calling to_sym when building arel nodes [CVE-2013-1854] Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets bumping to rc2 Revert "Merge pull request #8209 from senny/backport_8176" Freeze columns only once per Result Preparing for 3.2.13.rc1 release Update CHANGELOGs for 3.2.13 release. Conflicts: actionmailer/CHANGELOG.md actionpack/CHANGELOG.md activemodel/CHANGELOG.md activeresource/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md
| * bumping to 3.2.13Aaron Patterson2013-03-189-9/+9
| |
| * fix protocol checking in sanitization [CVE-2013-1857]Aaron Patterson2013-03-152-2/+12
| | | | | | | | | | Conflicts: actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
| * JDOM XXE Protection [CVE-2013-1856]Ben Murphy2013-03-155-3/+45
| | | | | | | | | | Conflicts: activesupport/test/xml_mini/jdom_engine_test.rb
| * fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]Charlie Somerville2013-03-152-3/+8
| |
| * stop calling to_sym when building arel nodes [CVE-2013-1854]Aaron Patterson2013-03-154-10/+10
| |
| * Merge pull request #9616 from exviva/multiple_select_name_double_square_bracketsCarlos Antonio da Silva2013-03-123-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrectly appended square brackets to a multiple select box Before: select(:category, [], {}, {:multiple => true, :name => "post[category][]"}) # => <select name="post[category][][]" ...> After: select(:category, [], {}, {:multiple => true, :name => "post[category][]"}) # => <select name="post[category][]" ...> Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_view/helpers/tags/base.rb actionpack/test/template/form_options_helper_test.rb
| * bumping to rc2Aaron Patterson2013-03-069-9/+9
| |
| * Revert "Merge pull request #8209 from senny/backport_8176"Aaron Patterson2013-03-052-21/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit 724020278480855bddfe749c91f1074d4f50f3c6, reversing changes made to e4e2bcce75b85fb8c1c49509a17bd5dfe6034c32. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/calculations.rb activerecord/test/cases/calculations_test.rb
| * Freeze columns only once per ResultSantiago Pastorino2013-03-051-3/+9
| | | | | | | | | | Conflicts: activerecord/lib/active_record/result.rb
| * Preparing for 3.2.13.rc1 releaseSteve Klabnik2013-02-279-17/+17
| |
| * Update CHANGELOGs for 3.2.13 release.Steve Klabnik2013-02-277-0/+35
| |
* | Merge pull request #9768 from senny/do_not_freeze_number_helper_defaultsCarlos Antonio da Silva2013-03-181-2/+2
|\ \ | | | | | | Do not freeze NumberHelper defaults
| * | do not freeze NumberHelper defaults.Yves Senn2013-03-181-2/+2
|/ / | | | | | | Closes #9767.
* | Typo fix [ci ski]Justin2013-03-151-2/+2
| | | | | | | | Closes #9730.
* | Merge pull request #7368 from jbarreneche/bug/render-locale-fallbacksSteve Klabnik2013-03-143-1/+21
|\ \ | | | | | | i18n locale fallback for localized views
| * | Extract hardcoded lists to Redo::RestaurantsListJuan Barreneche2013-03-143-1/+21
|/ /
* | Fix ar:mysql2 build on Ruby 1.8.7Andrew White2013-03-131-4/+12
| | | | | | | | | | The `skip` method is a no-op on Ruby 1.8.7 so we still need to force skip by returning early from each test.
* | Fix `ActiveSupport::TimeZone.parse` when time is a local DST jumpAndrew White2013-03-133-7/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation `ActiveSupport::TimeZone.parse` used `Time.parse` which applies the system time DST rules to the parsed time. Instead we now use `Time.utc` and manually apply the offset. Backport tests from: 005d910624bbfa724b638426a000c8074d4201a2 c89b6c4cdce7ee55ed3665c099d914222fe0344a 03becb13099c439f6aea5058546bc8b0b19b8db8 Fixes #9678.
* | Merge pull request #9616 from exviva/multiple_select_name_double_square_bracketsCarlos Antonio da Silva2013-03-093-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrectly appended square brackets to a multiple select box Before: select(:category, [], {}, {:multiple => true, :name => "post[category][]"}) # => <select name="post[category][][]" ...> After: select(:category, [], {}, {:multiple => true, :name => "post[category][]"}) # => <select name="post[category][]" ...> Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_view/helpers/tags/base.rb actionpack/test/template/form_options_helper_test.rb
* | Merge pull request #9613 from arunagw/remove_fixmeCarlos Antonio da Silva2013-03-081-9/+8
|\ \ | | | | | | Removing FIXME
| * | Removing FIXMEArun Agrawal2013-03-081-9/+8
| | | | | | | | | As we did in master.
* | | Merge pull request #9609 from arunagw/using-latest-arjdbcCarlos Antonio da Silva2013-03-081-3/+3
|\ \ \ | | | | | | | | Using latest AR-JDBC for JRuby
| * | | Using latest AR-JDBC for JRubyArun Agrawal2013-03-081-3/+3
| |/ / | | | | | | | | | 1.2.5 and 1.2.6 are bad ones
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 05:49:38 +0000