aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #14745 from razum2um/plain-text-diagnosticsRafael Mendonça França2014-04-152-0/+9
|\ \ \ \ | | | | | | | | | | Display diagnostics in text format for xhr request
| * | | | Display diagnostics in text format for xhr requestVlad Bokov2014-04-142-0/+9
| | | | |
* | | | | Merge pull request #14728 from stomar/assertion-msgYves Senn2014-04-151-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Remove surplus period from assertion messages
| * | | | | Remove surplus period from assertion messagesMarcus Stollsteimer2014-04-131-3/+3
| | | | | |
* | | | | | Merge pull request #14642 from tgxworld/fix_notifications_not_unsubscribingYves Senn2014-04-151-5/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fix subscriptions not being unsubscribed.
| * | | | | Fix subscriptions not being unsubscribed.Guo Xiang Tan2014-04-141-5/+7
| |/ / / /
* | / / / Return null type format when format is not knowRafael Mendonça França2014-04-141-1/+1
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When requesting a controller with the following code with a unknown format: def my_action respond_to do |format| format.json { head :ok } format.any { render text: 'Default response' } end end we should render the default response instead of raising ActionController::UnknownFormat Fixes #14462 Conflicts: actionpack/CHANGELOG.md actionpack/test/controller/mime/respond_with_test.rb Conflicts: actionpack/CHANGELOG.md
* | | | Update documentation to use Rails.application insteadMarcel Morgan2014-04-132-2/+2
|/ / / | | | | | | | | | | | | | | | | | | References to ``AppName::Application` removed in favour of ``Rails.application`` as generated with a new rails 4.1 app. [ci skip]
* | | Merge pull request #14619 from winston/enhance-routing-error-htmlRafael Mendonça França2014-04-111-63/+119
|\ \ \ | | | | | | | | | | | | Enhance routing error html page
| * | | Split search results into 'exact matches' and 'fuzzy matches'.Winston2014-04-111-60/+96
| | | | | | | | | | | | | | | | - also refactored the javascript.
| * | | Improve CSS styling for routing error html page.Winston2014-04-111-7/+25
| | | |
| * | | Implement fuzzy matching for route search on routing error html page.Winston2014-04-111-8/+10
| | | |
* | | | Only make deeply nested routes shallow when parent is shallowAndrew White2014-04-111-1/+14
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Since `:shallow` may be set at any point in the resource nesting we should only make the new and collection routes shallow when the parent is shallow. This is a bit of a hack but until the mapper is refactored to an object graph instead of a hash of merged values it's the best we can do. Fixes #14684.
* | | Avoid URI parsingAndriel Nuernberg2014-04-091-5/+8
| | | | | | | | | | | | | | | This parsing is unecessary once the Request object already has the needed information.
* | | push move_string in to `move`Aaron Patterson2014-04-011-14/+12
| | |
* | | combine move_regexp and move_string so we only loop over states onceAaron Patterson2014-04-011-9/+6
| | |
* | | do not create memo objects since we'll just throw them awayAaron Patterson2014-04-012-9/+11
| | |
* | | only ask if `t` is empty once.Aaron Patterson2014-04-011-4/+1
| | |
* | | Tiny doc fix for Strong ParametersIan C. Anderson2014-03-301-1/+1
| | | | | | | | | - accepts_nested_attribute_for -> accepts_nested_attributes_for
* | | Merge pull request #13890 from achempion/syntax-error-backtraceYves Senn2014-03-291-0/+8
|\ \ \ | | | | | | | | append link to bad code when error type is SyntaxError
| * | | Append link to bad code to backtrace when exception is SyntaxErrorBoris Kuznetsov2014-03-271-0/+8
| | | |
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-03-291-0/+4
|\ \ \ \
| * | | | Mention required glob param name in match docs for mapperEarl St Sauver2014-03-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | THe match documentation doesn't mention any requirement of the parameter name requirement for matches. However, including a bare glob character without a variable assignment causes a parse error.
* | | | | Replace trivial regexp with string or index, twice as fastKelley Reynolds2014-03-282-2/+2
| |/ / / |/| | |
* | | | update comments to reflect that options support is not availableFrederick Cheung2014-03-251-2/+2
| | | |
* | | | Swapped parameters of assert_equal in assert_selectVishal Lal2014-03-221-1/+1
| | | |
* | | | The digest option is no longer honoured since Rails 3.0 [ci skip]Godfrey Chan2014-03-201-1/+1
| | | | | | | | | | | | | | | | Closes #8513
* | | | Merge pull request #14090 from ↵Aaron Patterson2014-03-171-10/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fortisque/kevin/stream_error_in_main_thread_if_not_committed re-raise error if error occurs before committing in streaming
| * | | | re-raise error if error occurs before committing in streamingKevin Casey2014-03-141-10/+11
| | | | | | | | | | | | | | | | | | | | update the tests, using an if-else
* | | | | Use nested_scope? not shallow? to determine whether to copy optionsAndrew White2014-03-161-1/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method `shallow?` returns false if the parent resource is a singleton so we need to check if we're not inside a nested scope before copying the :path and :as options to their shallow equivalents. Fixes #14388.
* | | | use the body proxy to freeze headersAaron Patterson2014-03-123-8/+41
| | | | | | | | | | | | | | | | | | | | | | | | avoid freezing the headers until the web server has actually read data from the body proxy. Once the webserver has read data, then we should throw an error if someone tries to set a header
* | | | just ask the response for the commit status, we do not need to ask the jarAaron Patterson2014-03-121-1/+1
| | | |
* | | | only write the jar if the response isn't committedAaron Patterson2014-03-124-10/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when streaming responses, we need to make sure the cookie jar is written to the headers before returning up the stack. This commit introduces a new method on the response object that writes the cookie jar to the headers as the response is committed. The middleware and test framework will not write the cookie headers if the response has already been committed. fixes #14352
* | | | Merge pull request #14291 from laurocaetano/doc-for-original-fullpathYves Senn2014-03-121-0/+7
|\ \ \ \ | | | | | | | | | | Add documentation for original_fullpath. [ci skip]
| * | | | [ci skip] Add documentation for original_fullpath.Lauro Caetano2014-03-111-0/+7
| | | | |
* | | | | Merge pull request #14262 from sferik/flat_mapAndrew White2014-03-097-18/+18
|\ \ \ \ \ | | | | | | | | | | | | Replace additional instances of map.flatten with flat_map
| * | | | | Replace map.flatten with flat_map in actionpackErik Michaels-Ober2014-03-037-18/+18
| | | | | |
* | | | | | Copy shallow options from normal options when using scopeAndrew White2014-03-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the options :shallow_prefix and :shallow_path are not set in the scope options then copy them from the normal :as and :path options if they are set.
* | | | | | Pull namespace defaults out of the options hashAndrew White2014-03-081-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a developer has specified either :path or :as in the options hash then these should be used as the defaults for :shallow_path and :shallow_prefix. Fixes #14241.
* | | | | | Only use shallow nested scope when depth is > 1Andrew White2014-03-081-20/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By tracking the depth of resource nesting we can push the need for nested shallow scoping to only those routes that are nested more than one deep. This allows us to keep the fix for #12498 and fix the regression in #14224. Fixes #14224.
* | | | | | Move setting :scope_level_resource to resource_scopeAndrew White2014-03-081-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally with_scope_level was exclusively for managing scope levels with resources, however it is now used for other things so it makes more sense to move the responsibility for setting the :scope_level_resource to the resource_scope method. This eliminates repeatedly setting it to the same resource as each resource method scope is evaluated.
* | | | | | Merge pull request #14280 from joho/make_csrf_failure_logging_optionalSantiago Pastorino2014-03-081-1/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Make CSRF failure logging optional/configurable.
| * | | | | Make CSRF failure logging optional/configurable.John Barton (joho)2014-03-051-1/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | Added the log_warning_on_csrf_failure option to ActionController::RequestForgeryProtection which is on by default.
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-03-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/4_1_release_notes.md
| * | | | | :scissors:Zachary Scott2014-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This commit also addresses rails/docrails#169 and rails/rails#14159
* | | | | | Merge pull request #14285 from ↵Aaron Patterson2014-03-063-17/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | sikachu/master-revert-render-body-remove-content-type Do note remove `Content-Type` when `render :body`
| * | | | | Do note remove `Content-Type` when `render :body`Prem Sichanugrist2014-03-053-17/+4
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `render :body` should just not set the `Content-Type` header. By removing the header, it breaks the compatibility with other parts. After this commit, `render :body` will returns `text/html` content type, sets by default from `ActionDispatch::Response`, and it will preserve the overridden content type if you override it. Fixes #14197, #14238 This partially reverts commit 3047376870d4a7adc7ff15c3cb4852e073c8f1da.
* / | | | Introduce `Rails.gem_version`Prem Sichanugrist2014-03-052-7/+19
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method return `Gem::Version.new(Rails.version)`, suggesting a more reliable way to perform version comparison. Example: Rails.version #=> "4.1.2" Rails.gem_version #=> #<Gem::Version "4.1.2"> Rails.version > "4.1.10" #=> false Rails.gem_version > Gem::Version.new("4.1.10") #=> true Gem::Requirement.new("~> 4.1.2") =~ Rails.gem_version #=> true This was originally introduced as `.version` by @charliesome in #8501 but got reverted in #10002 since it was not backward compatible. Also, updating template for `rake update_versions`.
* | | | Add spaces to deep_munge log message.Shuhei Kagawa2014-03-031-3/+3
| | | |
* | | | Replace map.flatten(1) with flat_mapErik Michaels-Ober2014-02-282-5/+5
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 19:32:32 +0000