aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16738 from net-engine/guides-template-inheritanceRafael Mendonça França2015-02-251-0/+36
|\ | | | | Guides: Template Inheritance (new in guides, feature in since 3.1)
| * Merge remote-tracking branch 'origin/master' into guides-template-inheritanceecoologic2014-10-07235-943/+3435
| |\
| * | 2.2.14.5 Template Inheritance (new in guide, feature in since 3.1)erik2014-08-291-0/+36
| | |
* | | Merge pull request #17601 from kamipo/support_any_unicode_charsetsRafael Mendonça França2015-02-254-11/+16
|\ \ \ | | | | | | | | Add `SchemaMigration.create_table` support any unicode charsets for MySQL.
| * | | Add `SchemaMigration.create_table` support any unicode charsets for MySQL.Ryuta Kamizono2015-02-264-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL unicode support is not only `utf8mb4`. Then, The index length problem is not only `utf8mb4`. http://dev.mysql.com/doc/refman/5.6/en/charset-unicode.html SELECT * FROM information_schema.character_sets WHERE maxlen > 3; +--------------------+----------------------+------------------+--------+ | CHARACTER_SET_NAME | DEFAULT_COLLATE_NAME | DESCRIPTION | MAXLEN | +--------------------+----------------------+------------------+--------+ | utf8mb4 | utf8mb4_general_ci | UTF-8 Unicode | 4 | | utf16 | utf16_general_ci | UTF-16 Unicode | 4 | | utf16le | utf16le_general_ci | UTF-16LE Unicode | 4 | | utf32 | utf32_general_ci | UTF-32 Unicode | 4 | +--------------------+----------------------+------------------+--------+
* | | | Merge pull request #17297 from ↵Rafael Mendonça França2015-02-252-0/+26
|\ \ \ \ | |/ / / |/| | | | | | | | | | | rebyn/fix/17161-remove-objs-from-has_many-updates-fields Add specs for adding-to/clear has_many collections’s behavior on `updated_at`
| * | | Add specs for adding-to/clear has_many collections’s behavior on `updated_at`Tu Hoang2014-10-302-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are behaviors mentioned in #17161 that: 1. are not documented properly, and 2. don't have specs This commit addresses the spec absence. For has_many collections, 1. addition (<<) should update the associated object's updated_at (if any) 2. .clear, depending on options[:dependent], calls delete_all, destroy_all, or nullifies the associated object(s)' foreign key.
* | | | Merge pull request #15476 from JacobEvelyn/masterRafael Mendonça França2015-02-252-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | Use logger environment settings in Rails console.
| * | | | Use logger environment settings in Rails console.Jacob Evelyn2014-06-022-0/+10
| | | | |
* | | | | fix bug in Levenshtein distance calculationschneems2015-02-251-2/+0
| | | | | | | | | | | | | | | | | | | | Bug was discovered and discussed in #18395.
* | | | | add CHANGELOG for f6e293ec54f02f83cdb37502bea117f66f87bcae. [ci skip]Yves Senn2015-02-251-0/+7
| | | | |
* | | | | Fix default headers in test responsesJeremy Kemper2015-02-255-34/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes regression in #18423. Merge default headers for new responses, but don't merge when creating a response from the last session request. hat tip @senny :heart:
* | | | | Merge pull request #19076 from nygrenh/truncate-words-fixRafael Mendonça França2015-02-253-1/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix a backtracking problem in String#truncate_words
| * | | | | Fix a backtracking problem in String#truncate_wordsHenrik Nygren2015-02-253-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #19070.
* | | | | | Merge pull request #19074 from ↵Rafael Mendonça França2015-02-253-5/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mession/fix_test_dependency_of_erb_template_partial_with_layout Fix dependency tracker bug
| * | | | | | Fix dependency tracker bugJuho Leinonen2015-02-253-5/+20
| |/ / / / /
* | | | | | Merge pull request #18948 from kaspth/automatic-collection-cachingRafael Mendonça França2015-02-2517-22/+305
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Merge multi_fetch_fragments.
| * | | | | Instrument read_multi.Kasper Timm Hansen2015-02-213-20/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds `read_multi` instrumentation formatted as: Caches multi read: - views/david/2/4184ab71db6849621a4d8820fcd2c0ad - views/david/2/4184ab71db6849621a4d8820fcd2c0ad - views/david/3/4184ab71db6849621a4d8820fcd2c0ad - views/david/3/4184ab71db6849621a4d8820fcd2c0ad
| * | | | | Collections automatically cache and fetch partials.Kasper Timm Hansen2015-02-2111-3/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collections can take advantage of `multi_read` if they render one template and their partials begin with a cache call. The cache call must correspond to either what the collections elements are rendered as, or match the inferred name of the partial. So with a notifications/_notification.html.erb template like: ```ruby <% cache notification %> <%# ... %> <% end %> ``` A collection would be able to use `multi_read` if rendered like: ```ruby <%= render @notifications %> <%= render partial: 'notifications/notification', collection: @notifications, as: :notification %> ```
| * | | | | Merge multi_fetch_fragments.Kasper Timm Hansen2015-02-206-2/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes caching a collection of template partials faster using `read_multi` on the Rails cache store. Some caching implementations have optimized `read_multi` so we don't have to check in the cache store for every template.
* | | | | | Merge pull request #19072 from y-yagi/mailer_docAbdelkader Boudih2015-02-251-15/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | update docs to reflect that mailer generator add suffix to generated classes [ci skip]
| * | | | | | update docs to reflect that mailer generator add suffix to generated classes ↵yuuji.yaginuma2015-02-251-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge pull request #19069 from robertzk/patch-1Abdelkader Boudih2015-02-251-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix typo [ci-skip]
| * | | | | | | fix typo [ci-skip]Robert Krzyzanowski2015-02-251-1/+1
|/ / / / / / /
* | | | | | | cache quoted column names in SQLite3Aaron Patterson2015-02-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | we do this in other adapters, and it's a nice speed improvement
* | | | | | | Merge pull request #19068 from pda/ar-translate-exception-class-no-logAaron Patterson2015-02-241-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | AR: translate_exception_class() no longer logs error.
| * | | | | | | AR: translate_exception_class() no longer logs error.Paul Annesley2015-02-241-1/+0
| | | | | | | |
* | | | | | | | Merge pull request #18936 from arthurnn/txn_callbacksArthur Nogueira Neves2015-02-244-4/+105
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Spike on new transaction callbacks
| * | | | | | | | Rename testsArthur Neves2015-02-241-4/+4
| | | | | | | | |
| * | | | | | | | Add before_commitArthur Neves2015-02-244-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [fixes #18903]
| * | | | | | | | Add transaction callbacks that wont enroll to the transaction.Arthur Neves2015-02-242-2/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add after_commit_without_transaction_enrollment and after_rollback_without_transaction_enrollment private callbacks so we can create after_commit and after_rollback callbacks without having the records automatic enrolled in the transaction. [fixes #18904]
* | | | | | | | | Merge pull request #17426 from jpcody/fixture_associations_fixAaron Patterson2015-02-242-1/+23
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Rely on through table name in has_many fixtures
| * | | | | | | | Rely on through table name in has_many fixturesJoshua Cody2014-10-292-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than using the association's join_table method, which constructs a table name from conventions, this should rely on the through reflection's table_name to be resilient to tables that were not automatically named.
* | | | | | | | | Add a failing test demonstrating regression with HEAD requests to Rack apps, ↵Jeremy Kemper2015-02-241-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | re #18764
* | | | | | | | | Tiny documentation edits [ci skip]Robin Dupret2015-02-243-5/+4
| | | | | | | | |
* | | | | | | | | Call `attributes_for_update` in `_update_record` w/ optimistic lockingSean Griffin2015-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #19057
* | | | | | | | | Fix c479480638508c20601af69ca46b5b606c2d5b4d to account for from_value -> ↵Jeremy Kemper2015-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from_clause in bdc5141652770fd227455681cde1f9899f55b0b9
* | | | | | | | | Merge pull request #18744 from mfazekas/no-table-name-with-fromRafael Mendonça França2015-02-242-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix appending table_name to select and group when used with subquery (fr...
* | | | | | | | | Merge pull request #19066 from courtenay/mysql_boolean_limit_19065Rafael Mendonça França2015-02-242-0/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix mysql's schema.rb dumper so it does not include limit on emulated booleans
| * | | | | | | | | Fix mysql's schema.rb dumper so it does not include limit on emulated ↵Court3nay2015-02-242-0/+6
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | boolean tinyint(1) fields
* | | | | | | | | Merge pull request #19055 from ianks/model_name.to_jsonRafael Mendonça França2015-02-242-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | activemodel: make .model_name json encodable
| * | | | | | | | | activemodel: make .model_name json encodableIan Ker-Seymer2015-02-242-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, calling `User.model_name.to_json` would result in an infinite recursion as `.model_name` inherited its `.as_json` behavior from Object. This patch fixes that unexpected behavior by delegating `.as_json` to :name.
* | | | | | | | | | Use other controller instead of sharing the controllerRafael Mendonça França2015-02-241-18/+17
|/ / / / / / / / /
* | | | | | | | | Make TestController available to all test classesRafael Mendonça França2015-02-241-16/+16
| | | | | | | | |
* | | | | | | | | Merge pull request #19060 from iainbeeston/deprecate-skip-action-callbackRafael Mendonça França2015-02-243-2/+28
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Deprecate `AbstractController::Callbacks#skip_action_callback`
| * | | | | | | | | Deprecate `AbstractController::Callbacks#skip_action_callback`Iain Beeston2015-02-243-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of #19029, in future `skip_before_action`, `skip_after_action` and `skip_around_action` will raise an ArgumentError if the specified callback does not exist. `skip_action_callback` calls all three of these methods and will almost certainly result in an ArgumentError. If anyone wants to remove all three callbacks then they can still call the three individual methods. Therefore let's deprecate `skip_action_callback` now and remove it when #19029 is merged.
* | | | | | | | | | rework `disable_referential_integrity` for PostgreSQL.Yves Senn2015-02-243-9/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Toby Ovod-Everett & Andrey Nering & Yves Senn] Closes #17726. Closes #10939. This patch makes three distinct modifications: 1. no longer fall back to disabling user triggers if system triggers can't be disabled 2. warn the user when referential integrity can't be disabled 3. restore aborted transactions when referential integrity can't be disabled The motivation behind these changes is to make the behavior of Rails transparent and less error-prone. To require superuser privileges is not optimal but it's what Rails currently needs. Users who absolutely rely on disabling user triggers can patch `disable_referential_integrity`. We should investigate `SET CONSTRAINTS` as a possible solution which does not require superuser privileges. /cc @matthewd
* | | | | | | | | | Merge pull request #19064 from kamipo/remove_unused_tableRafael Mendonça França2015-02-241-10/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Remove unused table
| * | | | | | | | | | Remove unused tableRyuta Kamizono2015-02-251-10/+0
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | `postgresql_xml_data_type` table is used from nowhere.
* | | | | | | | | | Merge pull request #19062 from ↵Rafael Mendonça França2015-02-241-4/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/move_back_new_column_definition_into_table_definition Move back `new_column_definition` into `TableDefinition`
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 17:13:13 +0000