aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge pull request #8665 from ↵Santiago Pastorino2012-12-314-27/+4
| | | | | | | senny/8661_should_not_append_charset_if_already_present" This reverts commit e48dc194231830f42f179704596b88215f062c23, reversing changes made to d38c8caa48a732d41c7402a5e71deece4e313559.
* Merge pull request #8665 from ↵Santiago Pastorino2012-12-314-4/+27
|\ | | | | | | | | senny/8661_should_not_append_charset_if_already_present backport #8662, charset should not be appended for `head` responses
| * backport #8662, charset should not be appended for `head` responsesYves Senn2012-12-314-4/+27
|/ | | | | | | 1) Failure: test_head_created_with_image_png_content_type(RenderTest) [test/controller/render_test.rb:1238]: Expected: "image/png" Actual: "image/png; charset=utf-8"
* Revert "Fix `validates_presence_of` with `:allow_nil` or `:allow_blank` ↵Rafael Mendonça França2012-12-263-42/+3
| | | | | | | | | options." This reverts commit 93366c7c913bf0883f140fa782d3e198593477be. REASON: This is backward incompatible. Also this behavior is documented on the guides.
* Fix `validates_presence_of` with `:allow_nil` or `:allow_blank` options.Rafael Mendonça França2012-12-263-3/+42
| | | | | | Fix #8621 [Colin Kelley + Rafael Mendonça França]
* Merge pull request #8618 from senny/backport_8612Rafael Mendonça França2012-12-264-4/+40
|\ | | | | backport #8616, quote column names in generated fixture files
| * backport #8616, quote column names in generated fixture filesYves Senn2012-12-264-4/+40
|/ | | | | | | | | Conflicts: railties/CHANGELOG.md railties/lib/rails/generators/test_unit/model/model_generator.rb railties/lib/rails/generators/test_unit/model/templates/fixtures.yml railties/test/generators/model_generator_test.rb
* Serialized attribute can be serialized in an integer columnRafael Mendonça França2012-12-215-6/+49
| | | | | | | | | | Fix #8575 Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/attribute_methods/serialization.rb activerecord/test/cases/serialized_attribute_test.rb activerecord/test/models/person.rb
* Merge pull request #8558 from senny/backport_3489Carlos Antonio da Silva2012-12-193-1/+19
|\ | | | | Backport #8522, Keep index names when using with sqlite3
| * Backport #8522, Keep index names when using with sqlite3Yves Senn2012-12-193-1/+19
|/ | | | | | | | Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb activerecord/test/cases/migration/rename_column_test.rb
* Use 1.8 style hash in json encoding testCarlos Antonio da Silva2012-12-141-1/+1
|
* Remove unicode character encoding from ActiveSupport::JSON.encodeBrett Carter2012-12-143-10/+24
| | | | | | | | | | | | | | | | | | The encoding scheme (e.g. ☠ -> "\u2620") was broken for characters not in the Basic Multilingual Plane. It is possible to escape them for json using the weird encoding scheme of a twelve-character sequence representing the UTF-16 surrogate pair (e.g. '𠜎' -> "\u270e\u263a") but this wasn't properly handled in the escaping code. Since raw UTF-8 is allowed in json, it was decided to simply pass through the raw bytes rather than attempt to escape them. Backport of https://github.com/zbskii/rails/commit/9ace3a8820a5270f9b3f37b593f8bbea3e940f73 Conflicts: activesupport/CHANGELOG.md activesupport/lib/active_support/json/encoding.rb activesupport/test/json/encoding_test.rb
* Don't use 1.9 hash syntax on 3-2-stableAndrew White2012-12-142-14/+14
|
* Clear url helper methods when routes are reloadedAndrew White2012-12-144-6/+175
| | | | | | | | Clear url helper methods when routes are reloaded by removing the methods explicitly rather than just clearing the module because it didn't work properly and could be the source of a memory leak. Closes #8488.
* Merge pull request #8504 from senny/backport_8492Carlos Antonio da Silva2012-12-134-1/+24
|\ | | | | Backport of #8500, recognize migrations, in folders containing numbers and 'rb'.
| * recognize migrations, in folders containing numbers and 'rb'.Yves Senn2012-12-134-1/+24
|/ | | | | | | | | Backport of #8500 Closes #8492 Conflicts: activerecord/test/cases/migrator_test.rb
* Merge pull request #8490 from mattv/fix_request_raw_postRafael Mendonça França2012-12-113-2/+15
| | | | | | Fix rewinding in ActionDispatch::Request#raw_post Conflicts: actionpack/CHANGELOG.md
* Improve test name related to cache timestamp format [ci skip]Carlos Antonio da Silva2012-12-111-1/+1
|
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 12:34:17 +0000