aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16536 from rails/improve-custom-configurationRafael Mendonça França2014-08-198-46/+149
|\ | | | | Improve custom configuration
| * Improve custom configurationRafael Mendonça França2014-08-198-46/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Hashes can be assigned 2. We don't need a special level anymore The method chain only works in the top level. If users need a second level they need to assign a OrderedOptions to the key: config.resque.server = ActiveSupport::OrderedOptions.new config.resque.server.url = "http://localhost" config.resque.server.port = 3000 [Rafael Mendonça França + Carlos Antonio da Silva]
* | Protect against error when parsing parameters with Bad RequestRafael Mendonça França2014-08-193-2/+30
| | | | | | | | Related with #11795.
* | Merge pull request #16299 from sikachu/ps-safer-ac-paramsJeremy Kemper2014-08-195-39/+382
|\ \ | | | | | | Update `ActionController::Parameters` to be more secure on parameters handling
| * | User `#to_hash` instead of calling `super`Prem Sichanugrist2014-08-181-1/+1
| | | | | | | | | | | | Ruby 1.9.3 does not implement Hash#to_h, so we can't call `super` on it.
| * | Fix failing test on several methods on ParameterPrem Sichanugrist2014-08-183-3/+36
| | | | | | | | | | | | | | | | | | | | | * `each` * `each_pair` * `delete` * `select!`
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to make sure that `permitted` status is maintained on the resulting object. I found these methods that needs to be redefined by looking for `self.class.new` in the code. * extract! * transform_keys * transform_values
| * | Make `AC::Params#to_h` return Hash with safe keysPrem Sichanugrist2014-08-183-0/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActionController::Parameters#to_h` now returns a `Hash` with unpermitted keys removed. This change is to reflect on a security concern where some method performed on an `ActionController::Parameters` may yield a `Hash` object which does not maintain `permitted?` status. If you would like to get a `Hash` with all the keys intact, duplicate and mark it as permitted before calling `#to_h`. params = ActionController::Parameters.new(name: 'Senjougahara Hitagi') params.to_h # => {} unsafe_params = params.dup.permit! unsafe_params.to_h # => {"name"=>"Senjougahara Hitagi"} safe_params = params.permit(:name) safe_params.to_h # => {"name"=>"Senjougahara Hitagi"} This change is consider a stopgap as we cannot chage the code to stop `ActionController::Parameters` to inherit from `HashWithIndifferentAccess` in the next minor release. Also, adding a CHANGELOG entry to mention that `ActionController::Parameters` will not inheriting from `HashWithIndifferentAccess` in the next major version.
* | | Merge pull request #16562 from arthurnn/missing_string_requireRafael Mendonça França2014-08-191-0/+1
|\ \ \ | | | | | | | | Add missing AS require
| * | | Add missing AS requireArthur Neves2014-08-191-0/+1
| | |/ | |/| | | | | | | `strip_heredoc` method is defined on active_support/core_ext/string
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-08-1914-33/+62
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/mime_responds.rb actionview/lib/action_view/vendor/html-scanner/html/sanitizer.rb activerecord/lib/active_record/type/value.rb
| * | [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
| | | | | | | | | | | | [skip ci]
| * | [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 description
| * | | 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
|\ \ \ \ | | | | | | | | | | Do not depend on queue_classic on JRuby
| * | | | 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 [ci skip]
| * | | | 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.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]
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-15 02:18:17 +0000