aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Sync changelog entryJon Leighton2011-11-141-0/+2
|
* Merge pull request #3625 from guilleiguaran/sprockets-2.1.0Jon Leighton2011-11-141-1/+1
|\ | | | | Upgrade Sprockets to 2.1.0
| * Upgrade Sprockets to 2.1.0Guillermo Iguaran2011-11-141-1/+1
| | | | | | | | This version brings bug fixes for performance and caching.
* | Sync CHANGELOGs from 3-1-stableJon Leighton2011-11-141-0/+11
| |
* | remove ignored flag, fixes warningsAndre Arko2011-11-131-1/+1
| |
* | turns out the tests expect remote_addrs.firstAndre Arko2011-11-131-1/+1
| |
* | correctly raise IpSpoofAttackError messageAndre Arko2011-11-131-2/+2
| |
* | change tests to expect X-F-F over REMOTE_ADDRAndre Arko2011-11-131-2/+2
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-131-2/+2
|\ \
| * | Cosmetic fix in number_to_currency docsAlexey Vakhov2011-11-101-2/+2
| | |
* | | Merge pull request #3617 from indirect/remote_ipJosé Valim2011-11-132-53/+55
|\ \ \ | |_|/ |/| | refactor RemoteIp middleware
| * | defer calculating the remote IP until requestedAndre Arko2011-11-121-24/+36
| | |
| * | refactor RemoteIp middlewareAndre Arko2011-11-112-55/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - return the last forwarded IP before REMOTE_ADDR to handle proxies - remove completely superfluous RemoteIpGetter class - remove duplication of trusted proxies regexp - remove unused constant from Request - move comments from Request to where they are actually relevant - edit comments for clarity of purpose The original code (confusingly) tried to return REMOTE_ADDR both at the beginning and the end of the chain of options. Since REMOTE_ADDR is _always_ set, this is kind of silly. This change leaves REMOTE_ADDR as the last option, so that proxied requests will be assigned the correct remote IP address.
* | | Unneeded require memoizableAkira Matsuda2011-11-121-2/+0
|/ /
* | Merge pull request #3613 from mitio/fix-actionpack-responder-docsXavier Noria2011-11-111-4/+4
|\ \ | | | | | | Fix wording and minor typos in the Responder RDoc
| * | Fix wording and minor typos in the Responder RDocDimitar Dimitrov2011-11-111-4/+4
| | |
* | | Merge pull request #3592 from avakhov/av-highlight-regexpJosé Valim2011-11-102-1/+5
|\ \ \ | | | | | | | | Fix and simplify highlight regexp
| * | | Fix and simplify highlight regexpAlexey Vakhov2011-11-102-1/+5
| | |/ | |/|
* | | Merge pull request #3581 from amatsuda/metal_response_body_19José Valim2011-11-102-1/+13
|\ \ \ | |/ / |/| | AC::Metal#response_body= stores different value in Ruby 1.8 and 1.9
| * | A test case to ensure that AC::Metal#response_body= always wraps the given ↵Akira Matsuda2011-11-101-0/+6
| | | | | | | | | | | | value in an Array in both Ruby 1.8 and 1.9 (refs #3581)
| * | Fix AC::Metal#response_body= to store same value on Ruby 1.8 and 1.9Akira Matsuda2011-11-071-1/+7
| | | | | | | | | | | | This was because String#respond_to?(:each) differs in 1.8 and 1.9
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-082-13/+6
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: railties/guides/source/active_record_querying.textile
| * | | Fix small typo in link_to_function docAlexey Vakhov2011-11-081-1/+1
| | | |
| * | | Fixed stale doc in AbstractController::LayoutsDalibor Nasevic2011-11-061-12/+5
| |/ /
* | | Fix trouble using :subdomain in development environment when using ↵Bradford Folkens2011-11-082-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | numeric addresses. See-also pull request #3561 from 3-1-stable Otherwise the following occurs: TypeError: can't convert nil into String /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/http/url.rb:75:in host_or_subdomain_and_domain' /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/http/url.rb:37:in url_for' /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/routing/url_for.rb:147:in test_subdomain_may_be_accepted_with_numeric_host' /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/testing/setup_and_teardown.rb:67:in run' /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/callbacks.rb:426:in send' /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/callbacks.rb:81:in run'
* | | DrbStore removed from cache backendsIvan Evtukhovich2011-11-071-1/+0
| | |
* | | fix incorrect code exampleVijay Dev2011-11-071-1/+1
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-061-2/+2
|\ \
| * | Docs cosmetic fixes in Action View form_helper.rbAlexey Vakhov2011-11-061-2/+2
| | |
* | | RUBY_ENGINE is not defined on 1.8Jon Leighton2011-11-061-1/+1
| | |
* | | Implement a workaround for a bug in ruby-1.9.3p0.Jon Leighton2011-11-063-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug is that an error would be raised while attempting to convert a template from one encoding to another. Please see http://redmine.ruby-lang.org/issues/5564 for more details. The workaround is to load all conversions into memory ahead of time, and will only happen if the ruby version is *exactly* 1.9.3p0. The hope is obviously that the underlying problem will be resolved in the next patchlevel release of 1.9.3.
* | | Revert "Skip test_default_external_works on the CI for Ruby 1.9.3."Jon Leighton2011-11-061-11/+0
| | | | | | | | | | | | This reverts commit 10773f94eae0dacf10e2ed0c28f6bb73805c2521.
* | | bumps up sprocketsXavier Noria2011-11-051-1/+1
| | |
* | | Skip test_default_external_works on the CI for Ruby 1.9.3.Jon Leighton2011-11-051-0/+11
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test is affected by a bug in Ruby 1.9.3p0 and trunk: http://redmine.ruby-lang.org/issues/5564 Given we cannot fix it for ourselves, it is better to skip for now so that we will easily see if further failures are introduced. Jon Leighton is monitoring the bug report and will revert this when a suitable solution is found (either a new Ruby release or a generic workaround). If you are using 1.9.3 in your app and have templates that are not in UTF-8, you should add a workaround early on in the boot process. For example, if your templates are Shift_JIS encoded, then add the following in an initializer: Encoding::Converter.new('Shift_JIS', 'UTF-8')
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-053-5/+7
|\ \
| * | Fix javascript_include_tag examples in documentationAlexey Vakhov2011-11-031-2/+2
| | |
| * | Fix small typos in routing docsAlexey Vakhov2011-11-031-1/+3
| | |
| * | Fix typo in Dispatcher#controller documentationAviv Ben-Yosef2011-11-011-1/+1
| | |
| * | Fix typo in constraints method documentationAlexey Vakhov2011-11-011-1/+1
| | |
* | | add tests for the case where size is explicitly passed to number_field helperVijay Dev2011-11-041-0/+4
| | |
* | | Synchronize the gemspecs since CHANGELOG has been renamed to CHANGELOG.mdFranck Verrot2011-11-041-1/+1
| | |
* | | Convert CHANGELOGs to Markdown format.Jon Leighton2011-11-042-5689/+5663
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reasons: * Markdown reads well as plain text, but can also be formatted. * It will make it easier for people to read on the web as Github formats the Markdown nicely. * It will encourage a level of consistency when people are writing CHANGELOG entries. The script used to perform the conversion is at https://gist.github.com/1339263
* | | Remove 'size' attribute from number_field form helper fixes #3454Waseem Ahmad2011-11-042-2/+4
| | | | | | | | | | | | | | | f.number_field generates <input type="number", size="30"../> which is invalid HTML5. See: http://dev.w3.org/html5/spec/Overview.html#number-state
* | | Stub find_template so that when handle_render_error is called in ↵Jon Leighton2011-11-031-0/+3
| | | | | | | | | | | | | | | | | | ActionView::Template, we get to see the actual underlying error rather than a NoMethodError. This shows an encoding bug on Ruby 1.9.3.
* | | this should never return nil, so no use for "try"Aaron Patterson2011-10-311-1/+1
| | |
* | | Ensure that the format isn't applied twice to the cache key, else it becomes ↵Christopher Meiklejohn2011-10-312-1/+14
|/ / | | | | | | impossible to target with expire_action.
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-302-4/+4
|\ \
| * | Adds missing closing regex slashes.mjy2011-10-251-2/+2
| | |
| * | add namespacing when referring to ActionController::RedirectBackErrorNick Howard2011-10-251-2/+2
| | |
* | | ActiveRecord is no more in controller directory.Arun Agrawal2011-10-291-1/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 11:58:39 +0000