aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Skip adapter queue_classic for JRubyPeter Suschlik2014-08-191-0/+1
|
* Gem `queue_classic` does not support JRubyPeter Suschlik2014-08-191-1/+1
|
* Merge pull request #16554 from y-yagi/patch-2Arthur Nogueira Neves2014-08-191-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.yaginuma2014-08-191-1/+1
| | | | | | | | config.active_record.raise_in_transactional_callbacks
* | "warning: assigned but unused variable"Akira Matsuda2014-08-191-1/+0
| |
* | use same idiom to define class method as in every other adapter.Yves Senn2014-08-191-2/+4
| |
* | Merge pull request #16552 from untidy-hair/update_plugin_guideYves Senn2014-08-191-21/+21
|\ \ | | | | | | [ci skip] Update plugin doc with the latest rails
| * | [ci skip] Update plugin doc with the latest railsYukio Mizuta2014-08-181-21/+21
| | |
* | | http://gembundler.com/ => http://bundler.io/Akira Matsuda2014-08-191-1/+1
| | |
* | | Merge pull request #16553 from tomkadwill/removed_wordZachary Scott2014-08-191-1/+1
|\ \ \ | |_|/ |/| | [ci skip] Removed unnecessary word from Getting Started
| * | Removed unnecessary wordTom Kadwill2014-08-191-1/+1
|/ /
* | Sync Action Mailer release notes [ci skip]Godfrey Chan2014-08-181-0/+9
| |
* | Sync Action View release notes [ci skip]Godfrey Chan2014-08-181-0/+6
| |
* | Mention deprecation of assert_select and friends in the release notes [ci skip]Godfrey Chan2014-08-181-0/+4
| |
* | Add missing requireGodfrey Chan2014-08-181-0/+2
| |
* | require 'test_help' -> require 'rails/test_help'Sean Griffin2014-08-181-1/+1
| |
* | Merge pull request #16542 from ↵Rafael Mendonça França2014-08-181-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ça2014-08-181-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_constraintseileencodes2014-08-181-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_sanitizerRafael Mendonça França2014-08-181-0/+1
| |
* | Removed warningRafael Mendonça França2014-08-181-1/+1
| |
* | Deprecate TagAssertion instead of removingRafael Mendonça França2014-08-182-1/+2
| |
* | Merge pull request #16548 from arthurnn/fix_warn_messageDavid Heinemeier Hansson2014-08-181-1/+1
|\ \ | | | | | | Fix after_commit warning message
| * | Fix after_commit warning messageArthur Neves2014-08-181-1/+1
|/ /
* | Merge pull request #16545 from jonatack/patch-9Zachary Scott2014-08-181-1/+1
|\ \ | | | | | | Fix broken link to Upgrading Ruby on Rails Guide [ci skip]
| * | Fix broken link to Upgrading Ruby on Rails GuideJon Atack2014-08-181-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 Borges2014-08-184-1/+22
| | | | | | | | Fixes #15821.
* | Merge pull request #16547 from cristianbica/add-active-job-guide-linksRafael Mendonça França2014-08-181-0/+4
|\ \ | | | | | | Add activejob guide to documents.yml [ci skip]
| * | Add activejob guide to documents.yml [ci skip]Cristian Bica2014-08-181-0/+4
| | |
* | | Merge pull request #16539 from seuros/activejobJeremy Kemper2014-08-182-1/+19
|\ \ \ | |/ / |/| | [ActiveJob] Add queue_name_prefix
| * | [ActiveJob] Add queue_name_prefix so all queue are prefixed .Abdelkader Boudih2014-08-182-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-linkRafael Mendonça França2014-08-181-1/+1
|\ \ \ | |/ / |/| | fix broken link to rails blog [ci skip]
| * | fix broken link [ci skip]Aditya Kapoor2014-08-191-1/+1
| | |
* | | Merge pull request #16537 from arthurnn/stop_swallowing_errors_2Godfrey Chan2014-08-185-11/+138
|\ \ \ | | | | | | | | Add option to stop swallowing errors on callbacks.
| * | | Add option to stop swallowing errors on callbacks.Arthur Neves2014-08-185-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 tooRafael Mendonça França2014-08-181-4/+2
| | | |
* | | | Bump rack dependencySantiago Pastorino2014-08-181-1/+1
| | | |
* | | | Fix assertion to map the behaviour of the old sanitizerRafael Mendonça França2014-08-181-1/+1
| | | |
* | | | No need to point to arel and i18n master anymoreRafael Mendonça França2014-08-181-6/+2
| |_|/ |/| |
* | | Use the released beta of i18nCarlos Antonio da Silva2014-08-182-2/+1
| |/ |/|
* | :nail_care: [ci skip]Godfrey Chan2014-08-181-20/+26
| |
* | Sync action pack release notes [ci skip]Godfrey Chan2014-08-181-0/+8
| |
* | Check attributes passed to create_with and whereRafael Mendonça França2014-08-183-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
* Sync railties release notes [ci skip]Godfrey Chan2014-08-181-0/+40
|
* Merge pull request #16528 from ↵Santiago Pastorino2014-08-181-0/+4
|\ | | | | | | | | byroot/add-test-case-for-nested-array-in-where-conditions Add a test case of nested empty array values in conditions
| * Add a test case of nested empty array values in conditionsJean Boussier2014-08-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Post.where(id: [[]]).to_a Used to fail with a SQL syntax error (until 4.1): SELECT ... WHERE id in (); It now properly generate: SELECT ... WHERE 1=0;
* | "warning: `*' interpreted as argument prefix"Akira Matsuda2014-08-1810-10/+10
| |
* | Merge pull request #16540 from jonatack/patch-9Eileen M. Uchitelle2014-08-181-1/+1
|\ \ | | | | | | Fix rails-html_sanitizer in Gemfile template
| * | Fix rails-html_sanitizer in Gemfile templateJon Atack2014-08-181-1/+1
|/ / | | | | [skip ci]
* | Expectations firstAkira Matsuda2014-08-187-34/+34
| |