aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Make valid_type? public"Jon Leighton2013-02-154-12/+17
| | | | | | This reverts commit 5d528f835e871f5f9d4b68e8a81cfbe900b7e718. Relates to f8c8ad5 which is also getting reverted due to failing test.
* Revert "checking in the abstractions for valid type checking:"Jon Leighton2013-02-154-28/+1
| | | | | | | | | | | | | | | | This reverts commit c321b309a9a90bbfa0912832c11b3fef52e71840. Conflicts: activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb Reason: failing test 1) Error: test_valid_column(ActiveRecord::ConnectionAdapters::SQLite3AdapterTest): NoMethodError: undefined method `column' for test/cases/adapters/sqlite3/sqlite3_adapter_test.rb:29:in `test_valid_column'
* Revert "Revert "Merge pull request #9206 from ranjaykrishna/use_define_method""Jon Leighton2013-02-151-18/+13
| | | | | | This reverts commit 8aa4603a5adaa56c818a7bd1c0b761b4ecca3d3e. Reverting the revert because I reverted the wrong thing! Fail.
* Revert "Merge pull request #9206 from ranjaykrishna/use_define_method"Jon Leighton2013-02-151-13/+18
| | | | | | | | | | | | | This reverts commit 1fc6876b57f2e1d31731e74eb4271b5655e746d2, reversing changes made to 0268b5d8cdc3c5a1337462135f0a326a2654ba1a. Reason: failing test 1) Error: test_valid_column(ActiveRecord::ConnectionAdapters::SQLite3AdapterTest): NoMethodError: undefined method `column' for test/cases/adapters/sqlite3/sqlite3_adapter_test.rb:29:in `test_valid_column'
* Merge pull request #9298 from wangjohn/add_documentation_to_migration_collisionJeremy Kemper2013-02-151-1/+1
|\ | | | | Added extra comment when a migration already exists of the same name
| * Added extra comment when a migration already exists of the same name.wangjohn2013-02-151-1/+1
|/ | | | | | User should know that he can overwrite the previous migration. This comes in handy especially when generating models which were previously created then removed.
* Merge pull request #8704 from senny/remove_regexp_global_from_url_forAaron Patterson2013-02-142-2/+9
|\ | | | | replace regexp global in #url_for
| * replace regexp global in #url_forYves Senn2013-01-162-2/+9
| |
* | Merge pull request #9252 from senny/8423_hmt_preloading_bugRafael Mendonça França2013-02-143-1/+30
|\ \ | | | | | | don't cache invalid subsets when preloading hmt associations
| * | don't cache invalid subsets when preloading hmt associations.Yves Senn2013-02-143-1/+30
| | | | | | | | | | | | closes #8423.
* | | Merge pull request #9285 from rahul100885/masterGuillermo Iguaran2013-02-141-1/+1
|\ \ \ | | | | | | | | Bump rack-test dependency to 0.6.2
| * | | Bump rack-test dependency to 0.6.2Rahul P. Chaudhari2013-02-141-1/+1
| |/ /
* | | Merge pull request #9283 from rubys/masterCarlos Antonio da Silva2013-02-144-17/+12
|\ \ \ | |/ / |/| | Make valid_type? public
| * | Make valid_type? publicSam Ruby2013-02-144-17/+12
|/ /
* | Merge pull request #9254 from warnickr/9253_avoid_bigdecimal_performance_issueCarlos Antonio da Silva2013-02-131-4/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Before writing a numeric attribute value, ActiveRecord does an implicit conversion of boolean types (true => 1 and false => 0). If the numeric value being assigned is a BigDecimal, then ActiveRecord compares a BigDecimal to true and false. This is known to be very slow in Ruby 1.9.3 (see http://www.ruby-forum.com/topic/4409452 and https://bugs.ruby-lang.org/issues/7645#change-35188). The Ruby core team has implemented a fix for this issue that will be included in Ruby 2, but they appear to have no intention of back-porting this fix to Ruby 1.9.3. In my case, the performance impact of this issue was enormous (200% - 300% performance hit) for some of the pages in my application. See c75b5a88a82c79fdf95dfea4d72bf3c5a829930e applied to 3-2-stable branch for more reasoning and a benchmark.
| * | 9253: Before writing a numeric attribute value, ActiveRecord does an implicitRyan Warnick2013-02-131-4/+5
| | | | | | | | | | | | | | | | | | conversion of boolean types (true => 1 and false => 0). If the numeric value being assigned is a BigDecimal, then ActiveRecord compares a BigDecimal to true and false. This is known to be very slow in Ruby 1.9.3.
* | | Merge pull request #9115 from bensie/issue_5802Steve Klabnik2013-02-133-1/+36
|\ \ \ | | | | | | | | Don't call after_commit when creating through an association and save fails, fixes #5802
| * | | Don't call after_commit when creating through an association and save fails, ↵James Miller2013-02-133-1/+36
|/ / / | | | | | | | | | fixes #5802
* / / Avoid to_sym callsSantiago Pastorino2013-02-131-1/+1
|/ /
* | Merge pull request #9204 from ranjaykrishna/col-probAaron Patterson2013-02-128-1/+43
|\ \ | | | | | | schema dumper tests now conducted by ActiveRecord::Base.Connection
| * | checking in the abstractions for valid type checking:Ranjay Krishna2013-02-128-1/+43
| | |
* | | Merge pull request #9206 from ranjaykrishna/use_define_methodCarlos Antonio da Silva2013-02-121-18/+13
|\ \ \ | | | | | | | | Use define method instead of class_eval
| * | | reverted back our changes and added in the new define_methodRanjay Krishna2013-02-121-18/+13
| |/ /
* | | test for regression from a712e08ebe21f6d8653a0e6602df2e0f5d40d9caAaron Patterson2013-02-111-0/+6
| | |
* | | Merge pull request #9250 from senny/8583_fix_engines_documentation_example_codeSteve Klabnik2013-02-111-4/+12
|\ \ \ | | | | | | | | fix example code in engines guide
| * | | fix the example code in the engines guide. closes #8583.Yves Senn2013-02-111-0/+8
| | | |
| * | | remove trailing whitespace from engines guideYves Senn2013-02-111-4/+4
| | | |
* | | | Merge pull request #9247 from lest/store-moduleCarlos Antonio da Silva2013-02-114-12/+54
|\ \ \ \ | |/ / / |/| | | define Active Record Store accessors in a module
| * | | define Active Record Store accessors in a moduleSergey Nartimov2013-02-114-12/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow store accessors to be overrided like other attribute methods, e.g.: class User < ActiveRecord::Base store :settings, accessors: [ :color, :homepage ], coder: JSON def color super || 'red' end end
* | | | Improve changelog entry from #9221 [ci skip]Carlos Antonio da Silva2013-02-112-18/+16
| | | |
* | | | Add changelog entry for #9177 [ci skip]Carlos Antonio da Silva2013-02-111-4/+11
| | | | | | | | | | | | | | | | Add test:all and test:all:db rake tests to speed up full test runs.
* | | | Merge pull request #9221 from thenickcox/image_alt_attributeCarlos Antonio da Silva2013-02-113-4/+40
|\ \ \ \ | |/ / / |/| | | Improve img alt attribute for screen readers
| * | | Improve img alt attribute for screen readersthenickcox2013-02-093-4/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the img_alt method in ActionView keeps underscores in the alt attribute. Because underscores are pronounced in Apple's VoiceOver Utility, this has serious implications for accessibility. This patch makes underscored or hyphenated file names (both common in projects) read more naturally in screen readers by replacing them with spaces. See method documentation for details. Added documentation to image_alt method
* | | | fixing bit string testAaron Patterson2013-02-101-3/+3
| | | |
* | | | Merge pull request #9245 from vasconcelloslf/fix_guide_typoSteve Klabnik2013-02-101-1/+1
|\ \ \ \ | | | | | | | | | | fix a typo on the engine guide
| * | | | fix a typo on the engine guideLuis Vasconcellos2013-02-111-1/+1
|/ / / /
* | | | Merge pull request #9240 from tricknotes/supress-warningGuillermo Iguaran2013-02-101-0/+2
|\ \ \ \ | | | | | | | | | | Supress warning about method redifinition
| * | | | Supress warning about method redifinitionRyunosuke SATO2013-02-111-0/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In i18n gem, the following methods are defined. - `Hash#except` - `Hash#slice` But if there are defined already, i18n skips these definitions. So these definition by `active_support` are required before `require 'i18n'`.
* | | | Merge pull request #9238 from norman/unicode_62Carlos Antonio da Silva2013-02-102-1/+1
|\ \ \ \ | | | | | | | | | | Update to latest Unicode data.
| * | | | Update to latest Unicode data.Norman Clarke2013-02-102-1/+1
| | | | | | | | | | | | | | | | | | | | Release notes at: http://www.unicode.org/versions/Unicode6.2.0/
* | | | | Merge pull request #8643 from tricknotes/remove-method-redefined-warningAndrew White2013-02-101-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove method redefined warning
| * | | | | Remove method redefined warningRyunosuke SATO2013-02-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In `i18n` gem, the method definition of `Hash#deep_merge!` is skipped when it is already defined. - warning: method redefined; discarding old deep_merge!
* | | | | | Merge pull request #7730 from beyond/gzipXavier Noria2013-02-103-2/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | added compress options for gzip
| * | | | | | added compress options for gzipBeyond2013-02-103-2/+25
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added test for compress options of gzip update changelog
* | | | | | Prefer Ruby 2.0; require 1.9.3+Jeremy Kemper2013-02-094-9/+9
| | | | | |
* | | | | | Merge pull request #9234 from senny/9231_no_numbers_in_route_namespaces_allowedCarlos Antonio da Silva2013-02-092-1/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | The `:controller` option for routes can contain numbers. closes #9231.
| * | | | | | the `:controller` option for routes can contain numbers. closes #9231.Yves Senn2013-02-092-1/+13
| | | | | | |
* | | | | | | Merge pull request #9233 from rahul100885/masterCarlos Antonio da Silva2013-02-093-1/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Added notice message for destroy method in scaffold
| * | | | | | Added notice message for destroy method in scaffoldRahul P. Chaudhari2013-02-103-1/+6
| | | | | | |
* | | | | | | Update activerecord/CHANGELOG.mdGuillermo Iguaran2013-02-091-1/+1
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-02 17:46:12 +0000