Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add missing AS require | Arthur Neves | 2014-08-19 | 1 | -0/+1 |
| | | | | `strip_heredoc` method is defined on active_support/core_ext/string | ||||
* | minor copy editing [ci skip] | Vijay Dev | 2014-08-19 | 1 | -3/+1 |
| | |||||
* | Merge pull request #16487 from jayshepherd/patch-1 | Rafael Mendonça França | 2014-08-19 | 1 | -1/+1 |
|\ | | | | | Small grammar fix in pluck description | ||||
| * | Small grammar fix in pluck description | Jay Shepherd | 2014-08-12 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #16559 from splattael/jruby-queue_classic | Rafael Mendonça França | 2014-08-19 | 2 | -1/+2 |
|\ \ | | | | | | | Do not depend on queue_classic on JRuby | ||||
| * | | Skip adapter queue_classic for JRuby | Peter Suschlik | 2014-08-19 | 1 | -0/+1 |
| | | | |||||
| * | | Gem `queue_classic` does not support JRuby | Peter Suschlik | 2014-08-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #16556 from jonatack/patch-9 | Robin Dupret | 2014-08-19 | 1 | -15/+16 |
|\ \ \ | |/ / |/| | | 4.2 Release Notes pass [ci skip] | ||||
| * | | 4.2 Release Notes pass [skip ci] | Jon Atack | 2014-08-19 | 1 | -15/+16 |
| | | | |||||
* | | | Merge pull request #16554 from y-yagi/patch-2 | Arthur Nogueira Neves | 2014-08-19 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | [ci skip] config.active_record.errors_in_transactional_callbacks -> config.active_record.raise_in_transactional_callbacks | ||||
| * | | | [ci skip] config.active_record.errors_in_transactional_callbacks -> ↵ | yuuji.yaginuma | 2014-08-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | config.active_record.raise_in_transactional_callbacks | ||||
* | | | | "warning: assigned but unused variable" | Akira Matsuda | 2014-08-19 | 1 | -1/+0 |
| | | | | |||||
* | | | | use same idiom to define class method as in every other adapter. | Yves Senn | 2014-08-19 | 1 | -2/+4 |
| | | | | |||||
* | | | | Merge pull request #16552 from untidy-hair/update_plugin_guide | Yves Senn | 2014-08-19 | 1 | -21/+21 |
|\ \ \ \ | |_|/ / |/| | | | [ci skip] Update plugin doc with the latest rails | ||||
| * | | | [ci skip] Update plugin doc with the latest rails | Yukio Mizuta | 2014-08-18 | 1 | -21/+21 |
| | | | | |||||
* | | | | http://gembundler.com/ => http://bundler.io/ | Akira Matsuda | 2014-08-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #16553 from tomkadwill/removed_word | Zachary Scott | 2014-08-19 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | [ci skip] Removed unnecessary word from Getting Started | ||||
| * | | | Removed unnecessary word | Tom Kadwill | 2014-08-19 | 1 | -1/+1 |
|/ / / | |||||
* | | | Sync Action Mailer release notes [ci skip] | Godfrey Chan | 2014-08-18 | 1 | -0/+9 |
| | | | |||||
* | | | Sync Action View release notes [ci skip] | Godfrey Chan | 2014-08-18 | 1 | -0/+6 |
| | | | |||||
* | | | Mention deprecation of assert_select and friends in the release notes [ci skip] | Godfrey Chan | 2014-08-18 | 1 | -0/+4 |
| | | | |||||
* | | | Add missing require | Godfrey Chan | 2014-08-18 | 1 | -0/+2 |
| | | | |||||
* | | | require 'test_help' -> require 'rails/test_help' | Sean Griffin | 2014-08-18 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #16542 from ↵ | Rafael Mendonça França | 2014-08-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | seamusabshere/numerify-pool-checkout-timeout-from-urls-4-1-stable Make sure :checkout_timeout and :dead_connection_timeout are numbers Conflicts: activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | ||||
* | | | Merge pull request #16550 from ↵ | Rafael Mendonça França | 2014-08-18 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | eileencodes/remove-unnecessary-to_s-from-add_constraints-method Remove to_s from reflection.type in add_constraints | ||||
| * | | | Remove to_s from reflection.type in add_constraints | eileencodes | 2014-08-18 | 1 | -2/+2 |
|/ / / | | | | | | | | | | | | | | | | | | | The instance var is already saved as a string in the initialization method of AssociationReflection. See https://github.com/rails/rails/blob/master/activerecord/lib/active_record/reflection.rb#L273 | ||||
* | | | Point to unreleased deprecated_sanitizer | Rafael Mendonça França | 2014-08-18 | 1 | -0/+1 |
| | | | |||||
* | | | Removed warning | Rafael Mendonça França | 2014-08-18 | 1 | -1/+1 |
| | | | |||||
* | | | Deprecate TagAssertion instead of removing | Rafael Mendonça França | 2014-08-18 | 2 | -1/+2 |
| | | | |||||
* | | | Merge pull request #16548 from arthurnn/fix_warn_message | David Heinemeier Hansson | 2014-08-18 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix after_commit warning message | ||||
| * | | | Fix after_commit warning message | Arthur Neves | 2014-08-18 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #16545 from jonatack/patch-9 | Zachary Scott | 2014-08-18 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix broken link to Upgrading Ruby on Rails Guide [ci skip] | ||||
| * | | | Fix broken link to Upgrading Ruby on Rails Guide | Jon Atack | 2014-08-18 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | | | | in the 4.2 Release Notes [skip ci] Change to link suggested by @zzak [skip ci] | ||||
* | | | Fixes the `Relation#exists?` to work with polymorphic associations. | Kassio Borges | 2014-08-18 | 4 | -1/+22 |
| | | | | | | | | | | | | Fixes #15821. | ||||
* | | | Merge pull request #16547 from cristianbica/add-active-job-guide-links | Rafael Mendonça França | 2014-08-18 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | Add activejob guide to documents.yml [ci skip] | ||||
| * | | | Add activejob guide to documents.yml [ci skip] | Cristian Bica | 2014-08-18 | 1 | -0/+4 |
| | | | | |||||
* | | | | Merge pull request #16539 from seuros/activejob | Jeremy Kemper | 2014-08-18 | 2 | -1/+19 |
|\ \ \ \ | |/ / / |/| | | | [ActiveJob] Add queue_name_prefix | ||||
| * | | | [ActiveJob] Add queue_name_prefix so all queue are prefixed . | Abdelkader Boudih | 2014-08-18 | 2 | -1/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | We can split queues on a per environement basis as well as seggregate per application so we can split queues on a per env basis ActiveJob::Base.queue_name_prefix = 'foo' | ||||
* | | | | Merge pull request #16546 from aditya-kapoor/remove-broken-link | Rafael Mendonça França | 2014-08-18 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | fix broken link to rails blog [ci skip] | ||||
| * | | | fix broken link [ci skip] | Aditya Kapoor | 2014-08-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #16537 from arthurnn/stop_swallowing_errors_2 | Godfrey Chan | 2014-08-18 | 5 | -11/+138 |
|\ \ \ \ | | | | | | | | | | | Add option to stop swallowing errors on callbacks. | ||||
| * | | | | Add option to stop swallowing errors on callbacks. | Arthur Neves | 2014-08-18 | 5 | -11/+138 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, Active Record will rescue any errors raised within after_rollback/after_create callbacks and print them to the logs. Next versions of rails will not rescue those errors anymore, and just bubble them up, as the other callbacks. This adds a opt-in flag to enable that behaviour, of not rescuing the errors. Example: # For not swallow errors in after_commit/after_rollback config.active_record.errors_in_transactional_callbacks = true [fixes #13460] | ||||
* | | | | | Rack is released too | Rafael Mendonça França | 2014-08-18 | 1 | -4/+2 |
| | | | | | |||||
* | | | | | Bump rack dependency | Santiago Pastorino | 2014-08-18 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fix assertion to map the behaviour of the old sanitizer | Rafael Mendonça França | 2014-08-18 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | No need to point to arel and i18n master anymore | Rafael Mendonça França | 2014-08-18 | 1 | -6/+2 |
| |_|/ / |/| | | | |||||
* | | | | Use the released beta of i18n | Carlos Antonio da Silva | 2014-08-18 | 2 | -2/+1 |
| |/ / |/| | | |||||
* | | | :nail_care: [ci skip] | Godfrey Chan | 2014-08-18 | 1 | -20/+26 |
| | | | |||||
* | | | Sync action pack release notes [ci skip] | Godfrey Chan | 2014-08-18 | 1 | -0/+8 |
| | | | |||||
* | | | Check attributes passed to create_with and where | Rafael Mendonça França | 2014-08-18 | 3 | -2/+45 |
|/ / | | | | | | | | | | | | | | | | | | | | | If the request parameters are passed to create_with and where they can be used to do mass assignment when used in combination with Relation#create. Fixes CVE-2014-3514 Conflicts: activerecord/lib/active_record/relation/query_methods.rb |