aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Set the :shallow_path as each scope is generatedAndrew White2014-02-093-1/+95
| | | | | | | | | | | | | | | | If we set :shallow_path when shallow is called it can result in incorrect paths if the resource is inside a namespace because namespace itself sets the :shallow_path option to the namespace path. We fix this by removing the :shallow_path option from shallow as that should only be turning shallow routes on and not otherwise affecting the scope. To do this we need to treat the :shallow option to resources differently to other scope options and move it to before the nested block is called. This change also has the positive side effect of making the behavior of the :shallow option consistent with the shallow method. Fixes #12498.
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-02-091-3/+3
|\ | | | | | | | | | | | | Conflicts: guides/source/active_record_validations.md guides/source/api_documentation_guidelines.md guides/source/configuring.md
| * add punctuationWaynn Lue2014-01-131-2/+2
| |
| * change to "check out"Waynn Lue2014-01-081-1/+1
| |
* | Merge pull request #13982 from dskang/fix-response-flatten-infinite-recursionAaron Patterson2014-02-092-1/+19
|\ \ | | | | | | Fix response flatten infinite recursion
| * | Prevent [response].flatten from recursing infinitely.Dan Kang2014-02-082-1/+10
| | | | | | | | | | | | | | | | | | Returning `self` from within the array returned by `to_ary` caused this. Instead, we can just substitute another object. It provides the `each` behavior required by the rack spec.
| * | Add missing test for response destructuring.Myron Marston2014-02-081-0/+9
| | |
* | | Merge pull request #13990 from zzak/ap_dont_autoload_filter_parametersRafael Mendonça França2014-02-091-1/+0
|\ \ \ | | | | | | | | FilterParameters is referenced at the class level from the Request
| * | | FilterParameters is referenced at the class level from the RequestZachary Scott2014-02-091-1/+0
| |/ / | | | | | | | | | | | | Since it's already required in the file, we don't need to use autoload too. This commit is symmetrical change to 0b10180 for Response.
* | | Merge pull request #13985 from zzak/remove_old_todo_in_url_for_testCarlos Antonio da Silva2014-02-091-3/+0
|\ \ \ | | | | | | | | Remove outdated TODO from url_for test, this test was fixed in 900a2d30
| * | | Remove outdated TODO from url_for test, this test was fixed in 900a2d30Zachary Scott2014-02-091-3/+0
| |/ /
* | | use File.exist? instead of File.exists?SHIBATA Hiroshi2014-02-091-1/+1
| | |
* | | Skips tests on Windows that create files with illegal charactersMikko Johansson2014-02-091-2/+7
|/ /
* | Updated the cookie docs to use the safer JSON.{generate,parse}Godfrey Chan2014-02-081-5/+5
| | | | | | | | cc @senny
* | Rely on backticks instead of tt tags [ci skip]Robin Dupret2014-02-081-2/+2
| | | | | | | | | | Since the language in code blocks is inferred, if the code contains tt tags, the block will be parsed as XML for instance while it is Ruby.
* | docs, Cookie values are String based. Closes #12860. [ci skip]Yves Senn2014-02-081-7/+7
| |
* | Require action_view to fix missing constantPhilipe Fatio2014-02-072-0/+6
| | | | | | | | | | Previously, requiring action_view/view_paths did cause an uninitialized constant error for ENCODING_FLAG, which is defined in action_view.
* | Tests that skips a controller filters that was set up using a classIonatan Wiznia2014-02-061-0/+16
| |
* | synchronize 4.1 release notes with CHANGELOGS. [ci skip]Yves Senn2014-02-061-1/+1
| | | | | | | | /cc @chancancode
* | Merge pull request #13863 from joshjordan/jsj-dont-throw-out-get-paramsRafael Mendonça França2014-02-013-4/+36
|\ \ | | | | | | | | | | | | | | | | | | Do not discard query parameters on requests that use wrap_parameters Conflicts: actionpack/CHANGELOG.md
| * | Do not discard query parameters on requests that use wrap_parametersJosh Jordan2014-01-303-4/+36
| | |
* | | only ask for the location filters onceAaron Patterson2014-01-311-4/+5
| | |
* | | FilterRedirect is referenced at the class level from the ResponseAaron Patterson2014-01-312-1/+1
| | | | | | | | | | | | | | | We can just require the file rather than going through the autoload indirection
* | | tidy CHANGELOGs [ci skip]Yves Senn2014-01-301-2/+2
| | |
* | | Modify the session serializer implementationGuillermo Iguaran2014-01-303-19/+16
| | | | | | | | | | | | | | | Rename allowed options to :marshal and :json, for custom serializers only allow the use of custom classes.
* | | Update CHANGELOG properly with GH #13692 [ci-skip]Guillermo Iguaran2014-01-291-14/+14
| | |
* | | Allow session serializer key in config.session_storeLukasz Sarnacki2014-01-296-6/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MessageEncryptor has :serializer option, where any serializer object can be passed. This commit make it possible to set this serializer from configuration level. There are predefined serializers (:marshal_serializer, :json_serialzier) and custom serializer can be passed as String, Symbol (camelized and constantized in ActionDispatch::Session namepspace) or serializer object. Default :json_serializer was also added to generators to provide secure defalt.
* | | always use a block for cleanup / prepare callbacks so we can clean the ↵Aaron Patterson2014-01-281-0/+9
| | | | | | | | | | | | method signature
* | | scope is not necessaryAaron Patterson2014-01-281-2/+2
| | |
* | | Log which keys were set to nil in deep_mungeLukasz Sarnacki2014-01-283-4/+26
|/ / | | | | | | | | | | | | | | deep_munge solves CVE-2013-0155 security vulnerability, but its behaviour is definately confuisng. This commit adds logging to deep_munge. It logs keys for which values were set to nil. Also mentions in guides were added.
* | Clear filtered request attributes between requests in testsAndrew White2014-01-274-0/+29
| | | | | | | | | | | | | | | | The request attributes filtered_parameters, filtered_env and filtered_path are memoized for performance reasons. However this can cause unusual behavior in tests where there are multiple calls to get, post, etc. Fixes #13803.
* | Add additional tests for #13824Andrew White2014-01-251-0/+26
| |
* | Transform dashes to underscores in resource route namesByron Bischoff2014-01-252-7/+17
| | | | | | | | Fixes #13824
* | Remove unused argument.Francesco Rodriguez2014-01-241-1/+1
| |
* | Merge pull request #13811 from mdesantis/issue-13810Yves Senn2014-01-243-3/+30
|\ \ | | | | | | Fixes #13810 `rake routes` error when mount `Rails::Engine` with empty routes
| * | Fix `rake routes` error when `Rails::Engine` with empty routes is mounted; ↵Maurizio De Santis2014-01-243-3/+30
| | | | | | | | | | | | | | | | | | fixes rails/rails#13810 Squash
* | | Merge pull request #13819 from arthurnn/one_require_testGuillermo Iguaran2014-01-232-10/+8
|\ \ \ | | | | | | | | unify param.require tests
| * | | unify param.require testsArthur Neves2014-01-232-10/+8
| |/ /
* / / test boolean and number json param parsingArthur Neves2014-01-231-0/+7
|/ /
* | Tidy up tests and CHANGELOG for #12598Andrew White2014-01-204-7/+37
| |
* | Automatically convert dashes to underscores in shorthand routesMikko Johansson2014-01-202-0/+11
| |
* | Automatically convert dashes to underscores for url helpersAmr Tamimi2014-01-204-2/+20
| |
* | Revert "Don't remove trailing slash from PATH_INFO for mounted apps"Piotr Sarnacki2014-01-163-18/+1
| | | | | | | | | | | | | | The revert is needed because of a regression described in #13369, routes with trailing slash are no longer recognized properly. This reverts commit 50311f1391ddd8e0349d74eb57f04b7e0045a27d.
* | Add failing test for #13369Piotr Sarnacki2014-01-161-0/+18
| | | | | | | | | | | | After introducing 50311f1 a regression was introduced: routes with trailing slash are no longer recognized properly. This commit provides a failing test for this situation.
* | standardize on jruby_skip & rbx_skipGaurish Sharma2014-01-132-3/+10
| | | | | | | | | | | | This Adds helpers(jruby_skip & rbx_skip). In Future, Plan is to use these helpers instead of calls directly to RUBY_ENGINE/RbConfig/JRUBY_VERSION
* | Merge branch 'master' into laurocaetano-fix_send_fileAaron Patterson2014-01-1078-284/+1295
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (536 commits) doc, API example on how to use `Model#exists?` with multiple IDs. [ci skip] Restore DATABASE_URL even if it's nil in connection_handler test [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets reduce any confusion for users Ensure Active Record connection consistency Revert "ask the fixture set for the sql statements" Check `respond_to` before delegation due to: https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314 Adding Hash#compact and Hash#compact! methods MySQL version 4.1 was EOL on December 31, 2009 We should at least recommend modern versions of MySQL to users. clear cache on body close so that cache remains during rendering add a more restricted codepath for templates fixes #13390 refactor generator tests to use block form of Tempfile Fix typo [ci skip] Move finish_template as the last public method in the generator Minor typos fix [ci skip] make `change_column_null` reversible. Closes #13576. create/drop test and development databases only if RAILS_ENV is nil Revert "Speedup String#to" typo fix in test name. [ci skip]. `core_ext/string/access.rb` test what we are documenting. Fix typo in image_tag documentation ... Conflicts: actionpack/CHANGELOG.md
| * | add example to the CHANGELOG entry from 3a48b83e5 [ci skip].Yves Senn2014-01-061-2/+8
| | | | | | | | | | | | /cc @pixeltrix
| * | quick formatting pass through CHANGELOGS. [ci skip].Yves Senn2014-01-061-6/+6
| | |
| * | Allow an absolute controller path inside a module scopeAndrew White2014-01-053-2/+22
| | | | | | | | | | | | Fixes #12777
| * | Unique the segment keys array for non-optimized url helpersAndrew White2014-01-053-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 3.2 you only needed pass an argument for dynamic segment once so unique the segment keys array to match the number of args. Since the number of args is less than required parts the non-optimized code path is selected. This means to benefit from optimized url generation the arg needs to be specified as many times as it appears in the path. Fixes #12808
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 22:57:29 +0000