aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #16563 from arthurnn/add_ar_raise_trans_optionRafael Mendonça França2014-08-191-0/+5
|\
| * Add default .raise_in_transactional_callbacks option to templateArthur Neves2014-08-191-0/+5
* | loofah require dependecy is not needed anymoreRafael Mendonça França2014-08-192-4/+0
* | Merge pull request #16349 from jmcnevin/masterRafael Mendonça França2014-08-192-9/+23
|\ \
| * | Correctly determine if migration is needed.Jeremy McNevin2014-08-132-9/+23
* | | Merge pull request #16536 from rails/improve-custom-configurationRafael Mendonça França2014-08-198-46/+149
|\ \ \
| * | | Improve custom configurationRafael Mendonça França2014-08-198-46/+149
* | | | Protect against error when parsing parameters with Bad RequestRafael Mendonça França2014-08-193-2/+30
* | | | Merge pull request #16299 from sikachu/ps-safer-ac-paramsJeremy Kemper2014-08-195-39/+382
|\ \ \ \
| * | | | User `#to_hash` instead of calling `super`Prem Sichanugrist2014-08-181-1/+1
| * | | | Fix failing test on several methods on ParameterPrem Sichanugrist2014-08-183-3/+36
| * | | | Seperate Parameters accessors and mutators testsPrem Sichanugrist2014-08-183-57/+215
| * | | | Refactor code to reduce duplicate `self.class.new`Prem Sichanugrist2014-08-181-12/+10
| * | | | Add missing `Hash` methods to `AC::Parameters`Prem Sichanugrist2014-08-182-0/+61
| * | | | Make `AC::Params#to_h` return Hash with safe keysPrem Sichanugrist2014-08-183-0/+93
* | | | | Merge pull request #16562 from arthurnn/missing_string_requireRafael Mendonça França2014-08-191-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add missing AS requireArthur Neves2014-08-191-0/+1
| | |/ / | |/| |
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-08-1914-33/+62
|\ \ \ \ | |/ / / |/| | |
| * | | [ci skip] Update links in getting_started guide.Juanito Fatas2014-08-161-5/+5
| * | | `overriden` => `overridden`Vipul A M2014-08-131-1/+1
| * | | Uppercase HTML in docs.Hendy Tanata2014-08-0814-37/+37
| * | | [ci skip] Document ActionDispatch::Staticschneems2014-08-051-0/+9
| * | | [ci skip] document ActionDispatch::FileHandlerschneems2014-08-051-0/+10
| * | | [ci skip] Document PublicExceptions middlewareschneems2014-08-051-0/+10
* | | | minor copy editing [ci skip]Vijay Dev2014-08-191-3/+1
* | | | Merge pull request #16487 from jayshepherd/patch-1Rafael Mendonça França2014-08-191-1/+1
|\ \ \ \
| * | | | Small grammar fix in pluck descriptionJay Shepherd2014-08-121-1/+1
* | | | | Merge pull request #16559 from splattael/jruby-queue_classicRafael Mendonça França2014-08-192-1/+2
|\ \ \ \ \
| * | | | | 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 #16556 from jonatack/patch-9Robin Dupret2014-08-191-15/+16
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 4.2 Release Notes pass [skip ci]Jon Atack2014-08-191-15/+16
* | | | | | 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.ac...yuuji.yaginuma2014-08-191-1/+1
* | | | | | | "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 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
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | 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 seamusabshere/numerify-pool-checkout-timeout-f...Rafael Mendonça França2014-08-181-1/+1
* | | | | Merge pull request #16550 from eileencodes/remove-unnecessary-to_s-from-add_c...Rafael Mendonça França2014-08-181-2/+2
|\ \ \ \ \
| * | | | | Remove to_s from reflection.type in add_constraintseileencodes2014-08-181-2/+2
|/ / / / /
* | | | | Point to unreleased deprecated_sanitizerRafael Mendonça França2014-08-181-0/+1