aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Add :nsec format only for Ruby 1.9Carlos Antonio da Silva2012-12-114-10/+16
| | | | | | | | | | | | Ruby 1.8 does not support this format in Time, so the format will only be added to the available date formats on Ruby 1.9. Changelog entry was changed to explain that as well.
* | Run backported serialized test without Identity MapCarlos Antonio da Silva2012-12-111-2/+4
| | | | | | | | | | | | It fails with Identity Map because the find call returns the same object, so the "content" attribute that we expect to raise "missing attribute" is actually present.
* | Use 1.8 hash style :bomb:Carlos Antonio da Silva2012-12-111-2/+2
| |
* | Merge pull request #8441 from itzki/fix_decorate_columnsCarlos Antonio da Silva2012-12-111-0/+13
| | | | | | | | | | Backport test to ensure there won't be regressions. The issue only happens on master at the moment.
* | Add CHANGELOG entry for #6376.Rafael Mendonça França2012-12-101-0/+4
| |
* | Allow users to choose the timestamp format in the cache keyRafael Mendonça França2012-12-105-2/+36
| | | | | | | | | | | | This can be done using the class attribute cache_timestamp_format Closes #8195
* | Make sure the tests pass in the case closer to described in #8195Rafael Mendonça França2012-12-104-19/+14
| |
* | Merge pull request #6376 from jgaskins/timestamp-microsecondsJeremy Kemper2012-12-104-3/+6
| | | | | | | | | | | | Increase numeric-timestamp precision to nanoseconds Conflicts: activesupport/lib/active_support/core_ext/time/conversions.rb
* | Added regression test for #8195.jacobstr2012-12-101-0/+18
| |
* | Remove warning of unused variableRafael Mendonça França2012-12-101-1/+1
| |
* | Merge pull request #8477 from senny/backport_8448Rafael Mendonça França2012-12-104-14/+43
|\ \ | | | | | | Backport #8450, the return value from mailer methods is not relevant.
| * | Backport #8450, the return value from mailer methods is not relevant.Yves Senn2012-12-104-4/+30
| | | | | | | | | | | | | | | | | | | | | Conflicts: actionmailer/CHANGELOG.md actionmailer/lib/action_mailer/base.rb
| * | revised the actionmailer's CHANGELOG structureYves Senn2012-12-102-10/+13
|/ /
* | Unscope update_column(s) query to ignore default scopeCarlos Antonio da Silva2012-12-063-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When applying default_scope to a class with a where clause, using update_column(s) could generate a query that would not properly update the record due to the where clause from the default_scope being applied to the update query. class User < ActiveRecord::Base default_scope where(active: true) end user = User.first user.active = false user.save! user.update_column(:active, true) # => false In this situation we want to skip the default_scope clause and just update the record based on the primary key. With this change: user.update_column(:active, true) # => true Backport of #8436 fix. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/persistence.rb activerecord/test/cases/persistence_test.rb
* | Merge pull request #8417 from kennyj/fix_8414Rafael Mendonça França2012-12-042-3/+8
| | | | | | | | | | | | Fix #8414. Performance problem with postgresql adapter primary_key function. Conflicts: activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
* | Make distance_of_time_in_words work with DateTime offsetsAndrew White2012-12-042-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because DateTime#to_time returns self when it has a non-zero offset and subtracting two DateTime instances returns a Rational then the distance_of_time_in_words methods outputs an incorrect value. This is fixed in master because we can rely on Ruby 1.9.3's implementation of to_time but it can't be fixed on Ruby 1.8.7 as there is no way to map the DateTime to a Time with a non-zero offset. We can workaround the problem by casting to Float before doing the subtraction in the distance_of_time_in_words method. Closes #8390
* | Make output of distance_of_time_in_words consistentAndrew White2012-12-042-4/+21
| | | | | | | | | | | | | | | | | | | | This commit fixes the output of distance_of_time_in_words when using integer or duration arguments. Previously a distance of more than 30 seconds would be output as 'Less than 1 minute' when using integer arguments and '1 minute' when using two Time instances more than 30 seconds apart. Cherry picked from 5fdd4cd9e47be972f146a8a17a74c8f4700e2ac0
* | Merge pull request #8413 from senny/8403_backportRafael Mendonça França2012-12-044-2/+26
|\ \ | | | | | | backport #8403, no intermediate AR objects when eager loading.
| * | backport #8403, no intermediate AR objects when eager loading.Yves Senn2012-12-044-2/+26
|/ / | | | | | | | | | | | | | | | | Closes #3313 Conflicts: activerecord/CHANGELOG.md activerecord/test/models/developer.rb
* | Bump mailer to quiet the stdout log messagesJeremy Kemper2012-12-041-1/+1
| | | | | | | | | | Conflicts: actionmailer/actionmailer.gemspec
* | Merge pull request #4942 from bogdan/pluck_joinsJosé Valim2012-12-033-1/+20
| | | | | | | | | | | | | | | | AR::Relation#pluck: improve to work with joins Conflicts: activerecord/lib/active_record/relation/calculations.rb activerecord/test/cases/calculations_test.rb
* | Use send in Time marshal extensions since the methods are now privateCarlos Antonio da Silva2012-12-031-2/+2
| | | | | | | | | | | | | | See https://github.com/ruby/ruby/commit/9c1b3161f20162dc1682d758c0e4d2fc3a74745e All Active Support tests pass in 2.0.0preview2 after this change. Closes #8409
* | Skip ruby-prof in Gemfile for Ruby 2.0Carlos Antonio da Silva2012-12-031-1/+1
| |
* | Use 1.8 hash styleCarlos Antonio da Silva2012-12-031-1/+1
| |
* | Override <%== to always behave as literal text rather than toggling based on ↵Jeremy Kemper2012-12-033-4/+21
| | | | | | | | | | | | | | whether escaping is enabled. Fixes that existing plaintext email templates using <%== unexpectedly flipped to *escaping* HTML when #8235 was merged. Conflicts: actionpack/test/template/template_test.rb
* | Merge pull request #8405 from hsbt/fix-respond-initialize-dupCarlos Antonio da Silva2012-12-033-3/+3
|\ \ | | | | | | Handle respond_to? with private methods
| * | handled respond_to? with private methodsSHIBATA Hiroshi2012-12-033-3/+3
|/ /
* | Merge pull request #8402 from ↵Rafael Mendonça França2012-12-023-2/+17
| | | | | | | | | | | | | | | | | | senny/8376_descriptive_error_message_for_partial_layout_true More descriptive error when rendering a partial with `:layout => true` Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_view/renderer/partial_renderer.rb
* | Use 1.8 hash style in xml serialization testCarlos Antonio da Silva2012-11-301-1/+1
| |
* | Make the CHANGELOG consistent [ci skip]Rafael Mendonça França2012-11-301-11/+20
| |
* | Merge pull request #6397 from kennyj/fix_translate_exceptionAaron Patterson2012-11-302-3/+12
| | | | | | | | Fix a problem of translate_exception method in a Japanese (non English) environment.
* | Merge pull request #8380 from route/fix-concern-descriptionXavier Noria2012-11-301-1/+3
|\ \ | | | | | | Fixed description for ActiveSupport::Concern typical case
| * | Fixed description for ActiveSupport::Concern typical caseDmitry Vorotilin2012-11-301-1/+3
|/ /
* | Backport 78b30fed9336336694fb2cb5d2825f95800b541c to fix non-utf-8 databases ↵Jeremy Kemper2012-11-291-5/+19
| | | | | | | | mistakenly getting utf8 collation
* | Merge pull request #8352 from steveklabnik/update_7858Rafael Mendonça França2012-11-293-3/+21
| | | | | | | | | | | | | | Specify type of singular assication during serialization Conflicts: activemodel/CHANGELOG.md activemodel/test/cases/serializers/xml_serialization_test.rb
* | Merge pull request #7689 from cbarton/assume_migration_version_with_prefix_fixAaron Patterson2012-11-282-9/+29
|\ \ | | | | | | Fixing a schema:load when using a prefix and suffix on the tables [Reopen/backport]
| * | Making test accurately reflect what is going on in the schema migrations testChris Barton2012-09-182-9/+29
| | |
* | | Merge pull request #8327 from elia/fix-send-data-disposition-with-symbolsCarlos Antonio da Silva2012-11-283-2/+16
|\ \ \ | | | | | | | | | | | | Accept symbols as #send_data :disposition value
| * | | Accept symbols as #send_data :disposition valueElia Schito2012-11-273-2/+16
| | | |
* | | | Work around undiagnosed bug that's draining a relation's bind_valuesJeremy Kemper2012-11-281-0/+1
| | | |
* | | | Use 1.8 hash style in pg specific schemaCarlos Antonio da Silva2012-11-281-3/+3
|/ / /
* | | schema cache already has the columns as a hash, so use thatAaron Patterson2012-11-261-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commits 978ec98c8eff824a60c7e973f369cc7bed1f4d36 and 51676652a3568ad09b06385564de4fdcb13af05e changed database statements to use the schema_cache methods, added on master in c99e34e90d763c52cbe8dc3d950ed1b4db665dc4 and dc973e78560a6514ab172f0ee86dc84a9147d39a But apparently the methods weren't added to schema_cache, resulting in the failure described in #8322 for 3-2-stable. Fixes #8322. Conflicts: activerecord/lib/active_record/connection_adapters/schema_cache.rb
* | | Merge pull request #8325 from steveklabnik/backport_7997Carlos Antonio da Silva2012-11-261-1/+1
|\ \ \ | | | | | | | | @steveklabnik can't spell 'distance.' [ci skip]
| * | | @steveklabnik can't spell 'distance.'Steve Klabnik2012-11-261-1/+1
| | | |
* | | | Merge pull request #8321 from steveklabnik/backport_7997Rafael Mendonça França2012-11-263-7/+21
|\| | | | | | | | | | | Add i18n scope to disance_of_time_in_words.
| * | | Add i18n scope to disance_of_time_in_words.Steve Klabnik2012-11-263-7/+21
|/ / / | | | | | | | | | This is a backport of rails/rails#7997.
* | | schema cache already has the columns as a hash, so use thatAaron Patterson2012-11-251-1/+1
| | |
* | | speed up fixture loading by querying the schema cache for column namesAaron Patterson2012-11-251-1/+1
| | |
* | | Merge pull request #8311 from alisdair/dirty-nullable-datetimeCarlos Antonio da Silva2012-11-253-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't call will_change! for datetime nil->"". Setting a nil datetime attribute to a blank string should not cause the attribute to be dirty. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
* | | Merge pull request #8295 from senny/8265_backportRafael Mendonça França2012-11-223-1/+15
|\ \ \ | | | | | | | | backport #8291, prevent mass assignment of polymorphic type with `build`
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 21:21:56 +0000