aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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
* | | Merge pull request #9600 from larrylv/fix-load-target-with-identity-map-onRafael Mendonça França2013-03-071-3/+8
|\ \ \ | | | | | | | | @target might be nil when Identity Map is enabled.
| * | | @target might be nil when Identity Map is enabled.Larry Lv2013-03-081-3/+8
|/ / / | | | | | | | | | | | | | | | | | | * With Identity Map enabled, NameError might be raised and @target is nil. So we should always ensure `@target ||= find_target`. * Only force reload target when it is stale.
* | | Merge pull request #9549 from larrylv/reload-stable-target-before-savingRafael Mendonça França2013-03-076-6/+28
|\ \ \ | | | | | | | | Fix issue #7526. Reload the association target if it's stale.
| * | | Fix issue #7526. Reload the target if it's stale.larrylv2013-03-056-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This has been fixed at master via `365b8b6`, but not at 3-2-stable branch. * @stale_state should be nil when a model isn't saved. via `0f3901e`. * set @stale_state to nil when reset the target.
* | | | Merge pull request #9594 from yahonda/3-2-stable_prefix_suffixRafael Mendonça França2013-03-071-4/+5
|\ \ \ \ | | | | | | | | | | Use shorter prefix and suffix to support Oracle adapter
| * | | | Use shorter prefix and suffix as in Oracle database identifierYasuo Honda2013-03-071-4/+5
|/ / / / | | | | | | | | | | | | cannot be larger than 30 characters
* | | | Update CHANGELOGs for 3.2.13.rc1Steve Klabnik2013-03-057-0/+30
| | | |
* | | | Merge pull request #9543 from maximerety/backport_fix_7774Carlos Antonio da Silva2013-03-053-2/+16
|\ \ \ \ | |/ / / |/| | | Backported #7774 to 3-2-stable
| * | | Backport fixes about #7774 to 3-2-stablemaximerety2013-03-053-2/+16
|/ / / | | | | | | | | | | | | Fix ActionDispatch::Request#formats when HTTP_ACCEPT header is an empty string.
* | | Merge pull request #9531 from erik-escobedo/patch-1Guillermo Iguaran2013-03-031-1/+1
|\ \ \ | | | | | | | | Fix typo on ActionPack's ChangeLog
| * | | Fix typo on CHANGELOG.mdÉrik Escobedo2013-03-031-1/+1
| | | |
* | | | Merge pull request #9528 from korny/patch-1Andrew White2013-03-031-2/+0
|\ \ \ \ | |/ / / |/| | | Fix unused variable warning in mapper.rb
| * | | remove unused path_without_format variableKornelius Kalnbach2013-03-031-2/+0
|/ / / | | | | | | Was forgotten in a72dab0.
* | | Freeze columns only once per ResultSantiago Pastorino2013-03-031-3/+9
| | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/result.rb
* | | Update docs, change_table does not use TableDefinition.Yves Senn2013-02-281-2/+2
| | | | | | | | | | | | | | | | | | | | | [ci skip] Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
* | | Improve AR changelog [ci skip]Carlos Antonio da Silva2013-02-281-2/+5
| | |
* | | Merge pull request #9485 from authorNari/backport-6755-to-3-2-stableCarlos Antonio da Silva2013-02-283-1/+16
|\ \ \ | | | | | | | | | | | | | | | | Backported #6755 to 3-2-stable. Don't read csv file during executing db:fixtures:load. CSV fixtures have already been removed some time ago in 1716da07204193c8acf967e2d75a53a82e4c7c28, but the task was still loading them, even though later it tried to find the related yaml file.
| * | | Backported #6755 to 3-2-stable. Don't read csv file during executing ↵Narihiro Nakamura2013-02-283-1/+16
|/ / / | | | | | | | | | db:fixtures:load.
* | | Enforce i18n version >= v0.6.4Carlos Antonio da Silva2013-02-271-1/+1
| | | | | | | | | | | | | | | v0.6.2 and v0.6.3 both have issues with Ruby 1.8.7, see https://github.com/svenfuchs/i18n/issues/192 for more info.
* | | Merge pull request #9472 from yahonda/revert_7544c7a9Rafael Mendonça França2013-02-271-3/+1
|\ \ \ | | | | | | | | Revert "Skip test_remove_column_with_array_as_an_argument_is_deprecated ...
| * | | Revert "Skip test_remove_column_with_array_as_an_argument_is_deprecated with ↵Yasuo Honda2013-02-281-3/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | Oracle adapter." This reverts commit 7544c7a9f290a3ea25099ae38d52795458391785. Oracle enhanced adapter is supporting remove_column with Array.
* | | Merge pull request #9471 from yahonda/5837_32-stableRafael Mendonça França2013-02-271-4/+4
|\ \ \ | |_|/ |/| | Fix ORA-00972 error at test_rename_table_with_prefix_and_suffix
| * | Fix ORA-00972 error at test_rename_table_with_prefix_and_suffixYasuo Honda2013-02-281-4/+4
|/ / | | | | | | backport pull request#5837 to 3-2-stable
* | Tighten up AS.gemspec.Steve Klabnik2013-02-261-1/+1
| | | | | | | | | | Apparently 0.6.2 has a call to force_encoding, which is not around in 1.8.7.
* | CHANGELOG entry for ee291b9.Steve Klabnik2013-02-261-0/+5
| | | | | | | | Since we released it, it should go in the CHANGELOG.
* | Revert "Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric"Steve Klabnik2013-02-267-49/+14
| | | | | | | | This reverts commit 921a296a3390192a71abeec6d9a035cc6d1865c8.
* | Do not override attributes on `dup` by default scopesHiroshige Umino2013-02-263-1/+13
| |
* | Improve changelog entry [ci skip]Carlos Antonio da Silva2013-02-261-4/+4
| |
* | Merge pull request #9430 from authorNari/backport-7072-to-3-2-stableCarlos Antonio da Silva2013-02-263-1/+23
|\ \ | | | | | | Backported #7072 to 3-2-stable. Use database value for uniqueness validation scope
| * | Backported #7072 to 3-2-stable. Use database value for uniqueness validation ↵Narihiro Nakamura2013-02-263-1/+23
|/ / | | | | | | scope.
* | Merge pull request #9408 from mikeycgto/origin/3-2-stableRafael Mendonça França2013-02-241-1/+1
|\ \ | | | | | | Update RUBY_VERSION check for performance testing to handle 2.0.0
| * | Update RUBY_VERSION check for performance testing to handle 2.0.0mikeycgto2013-02-241-1/+1
|/ /
* | Merge pull request #9406 from rails/3-2-stable-ruby-2Rafael Mendonça França2013-02-2417-39/+50
|\ \ | | | | | | Rails 3.2.x is now compatible with Ruby 2.0.0
| * | Rails 3.2.x is now compatible with Ruby 2.0.0Prem Sichanugrist2013-02-241-3/+0
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-22 11:06:41 +0000