aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Removing to_shorthand from default_controller_and_action. Fixes #6497Luiz Felipe2012-09-193-3/+20
| | | | | When using shortcut routes inside an engine the "to_shorthand" variable is set to true, causing the module scope of the route to not be applied.
* Correct parameter access.Philip Arndt2012-09-191-1/+1
| | | * The params as supplied pass born in authors[0] but not authors[1] so it seems like the test isn't covering what it should be covering.
* fix shadowing outer local variable warningSergey Nartimov2012-09-191-3/+3
|
* Merge pull request #7251 from rails/integrate-strong_parametersDavid Heinemeier Hansson2012-09-1812-48/+385
|\ | | | | Integrate strong_parameters in Rails 4
| * AC::ParameterMissing inherits from KeyError since it's more appropiated than ↵Guillermo Iguaran2012-09-161-1/+1
| | | | | | | | IndexError
| * Support fields_for attributes, which may have numeric symbols as hash keysGuillermo Iguaran2012-09-162-0/+22
| |
| * Add config.action_controller.permit_all_attributes to bypass ↵Guillermo Iguaran2012-09-164-1/+21
| | | | | | | | StrongParameters protection
| * Change tainted/untainted wording to permitted/forbiddenGuillermo Iguaran2012-09-163-26/+26
| |
| * Don't use assert_nothing_raised when assert_equal is usedGuillermo Iguaran2012-09-161-4/+2
| |
| * require abstract_unit in parameters testsGuillermo Iguaran2012-09-163-0/+3
| |
| * Remove integration between attr_accessible/protected and ↵Guillermo Iguaran2012-09-163-48/+2
| | | | | | | | AC::Metal::ParamsWrapper
| * Integrate ActionController::Parameters from StrongParameters gemGuillermo Iguaran2012-09-168-0/+340
| |
* | copy edits 137e5d9Xavier Noria2012-09-181-1/+1
| |
* | Add extra documentation for password_fieldArek W2012-09-181-1/+1
| | | | | | | | I think this should be explicit as the password fields behaviour is inconsistent with other fields in this regard. It had me scratching my head until I dug through the source code.
* | cleanup, remove whitespace from CHANGELOGYves Senn2012-09-171-6/+6
| |
* | log 404 status when ActiveRecord::RecordNotFound was raised (#7646)Yves Senn2012-09-174-2/+26
| |
* | removes unnecessary selfXavier Noria2012-09-171-1/+1
| |
* | revises the RDoc of AC::Base.without_modulesXavier Noria2012-09-171-2/+2
| |
* | documents the request and response methods in AC::BaseXavier Noria2012-09-171-3/+21
| |
* | revises RDoc in AC::Metal [ci skip]Xavier Noria2012-09-171-14/+7
| |
* | removes unnecessary selfXavier Noria2012-09-171-1/+1
| |
* | Merge pull request #7669 from guilleiguaran/rename-rb-handlerCarlos Antonio da Silva2012-09-174-5/+5
|\ \ | | | | | | Rename .rb template handler to .ruby to avoid conflicts with mustache classes
| * | Rename .rb template handler to .ruby to avoid conflicts with mustache views ↵Guillermo Iguaran2012-09-174-5/+5
| |/ | | | | | | classes
* | allowing pass couple extension to register_template_handler callTima Maslyuchenko2012-09-173-3/+17
| |
* | Add missing entries in AP changelogGuillermo Iguaran2012-09-161-0/+13
|/
* Check if etag exists before to do the gsubRafael Mendonça França2012-09-151-2/+4
| | | | This fix the build http://travis-ci.org/#!/rails/rails/builds/2459981
* fix the buildSteve Klabnik2012-09-151-0/+1
|
* Support for multiple etags in an If-None-Match headerTravis Warlick2012-09-153-1/+48
| | | | | | | | This is a rebased version of #2520. Conflicts: actionpack/test/dispatch/request_test.rb
* update CHANGELOGSergey Nartimov2012-09-141-0/+16
| | | | | Add entry about 245941101b1ea00a9b1af613c20b0ee994a43946 and 95be790ece75710f2588558a6d5f40fd09543b97.
* Merge pull request #7634 from arunagw/build_fix_actionmailerJosé Valim2012-09-141-0/+1
|\ | | | | Build fix for ActionMailer
| * Build fix for ActionMailerArun Agrawal2012-09-141-0/+1
| | | | | | | | | | | | See http://travis-ci.org/#!/rails/rails/jobs/2444632
* | use presence method instead of checking for blankNihad Abbasov2012-09-141-1/+1
|/
* Merge pull request #7616 from lest/null-session-forgery-protectionMichael Koziarski2012-09-132-32/+76
|\ | | | | Implement :null_session CSRF protection method
| * Implement :null_session CSRF protection methodSergey Nartimov2012-09-132-32/+76
| | | | | | | | | | | | | | | | It's further work on CSRF after 245941101b1ea00a9b1af613c20b0ee994a43946. The :null_session CSRF protection method provide an empty session during request processing but doesn't reset it completely (as :reset_session does).
* | Define a SynchronousQueue for test in Action Pack.Rafael Mendonça França2012-09-122-6/+10
| | | | | | | | We don't need to rely on rails/queueing in Action Pack tests
* | Merge pull request #7612 from arunagw/build_fix_queueCarlos Antonio da Silva2012-09-121-0/+6
|\ \ | | | | | | Fix build Rails.queue
| * | Fix build Rails.queueArun Agrawal2012-09-121-0/+6
| |/ | | | | | | see 34b23e7110a3a13cf157608cefc9b5701017bf39
* / warning removed.Arun Agrawal2012-09-121-1/+0
|/ | | | | 1. Unused variable 2. possibly useless use of a variable in void context
* Merge pull request #7594 from guilleiguaran/rb-template-handlerRafael Mendonça França2012-09-104-0/+14
|\ | | | | Add .rb template handler
| * Add .rb template handlerGuillermo Iguaran2012-09-114-0/+14
| | | | | | | | This handler simply allows arbitrary Ruby code as a template
* | Merge pull request #7513 from kalys/masterCarlos Antonio da Silva2012-09-096-10/+10
|\ \ | | | | | | ERB::Util.html_escape encodes single quote as #39. Decimal form has better support in old browsers.
| * | &#39 dates back to SGML when &#x27 was introduced in HTML 4.0Kalys Osmonov2012-09-096-10/+10
| |/
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-091-1/+1
|\ \ | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
| * | Doc: sweepers only work on Active Record Modelsschneems2012-09-051-1/+1
| | | | | | | | | In response to this rails issue: https://github.com/rails/rails/issues/3729
* | | Use internal instance variable naming scheme for mounted URL helper proxiesSam Pohlenz2012-09-092-1/+12
| |/ |/|
* | Merge pull request #7577 from frodsan/fix_ap_responseRafael Mendonça França2012-09-081-25/+32
|\ \ | | | | | | set default_headers to nil after use it to avoid order dependent tests
| * | set default_headers to nil after use it to avoid order dependent testsFrancesco Rodriguez2012-09-081-25/+32
| | |
* | | Fixed missing requireIlya Vorontsov2012-09-081-0/+1
|/ / | | | | | | | | | | | | Missing require caused fail of guide generation (in action_dispatch/http/mime_type, line 295, undefined method `ends_with` for "to_ary":String) With this fix guides were normally generated
* | Tidy up excerpt separator logic a bitCarlos Antonio da Silva2012-09-081-17/+11
| |
* | Improve latest AR and AP changelog entriesCarlos Antonio da Silva2012-09-081-1/+6
| |