Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'serializers' | José Valim | 2011-11-25 | 1 | -0/+48 | |
|\ \ | |/ |/| | | | | | | | | | | | | | This implements the ActiveModel::Serializer object. Includes code, tests, generators and guides. From José and Yehuda with love. Conflicts: railties/CHANGELOG.md | |||||
| * | Rely solely on active_model_serializer and remove the fancy constant lookup. | José Valim | 2011-11-23 | 1 | -1/+15 | |
| | | ||||||
| * | Merge branch 'master' into serializers | José Valim | 2011-11-23 | 22 | -120/+537 | |
| |\ | ||||||
| * | | Initial commit of serializer support | Jose and Yehuda | 2011-10-15 | 1 | -0/+34 | |
| | | | ||||||
* | | | configuration option to always write cookie | lest | 2011-11-23 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge pull request #3733 from kennyj/fix_warnings_for_show_exceptions_test | Yehuda Katz | 2011-11-23 | 1 | -3/+3 | |
|\ \ \ | |_|/ |/| | | Warnings removed. (ambiguous first argument) | |||||
| * | | Warnings removed. (ambiguous first argument) | kennyj | 2011-11-24 | 1 | -3/+3 | |
| | | | ||||||
* | | | Rely on a public contract between railties instead of accessing railtie ↵ | José Valim | 2011-11-23 | 3 | -7/+5 | |
| | | | | | | | | | | | | methods directly. | |||||
* | | | Remove unreachable code, and add additional testcases. | kennyj | 2011-11-24 | 2 | -0/+24 | |
|/ / | ||||||
* | | Merge pull request #3718 from lest/fix-javascript-include-tag | José Valim | 2011-11-22 | 1 | -0/+3 | |
|\ \ | | | | | | | javascript_include_tag should add '.js' to sources that contain '.' | |||||
| * | | javascript_include_tag should add '.js' to sources that contain '.' | lest | 2011-11-22 | 1 | -0/+3 | |
| | | | ||||||
* | | | move show_detailed_exceptions? to Rescue module | lest | 2011-11-22 | 1 | -2/+2 | |
| | | | ||||||
* | | | refactor show exceptions tests | lest | 2011-11-22 | 2 | -42/+78 | |
| | | | ||||||
* | | | add ActionController::Metal#show_detailed_exceptions? | lest | 2011-11-22 | 1 | -19/+26 | |
|/ / | ||||||
* | | Merge pull request #3695 from tobiassvn/partial_path_error | Yehuda Katz | 2011-11-19 | 1 | -0/+7 | |
|\ \ | | | | | | | Meaningful errors for unexpected partial arguments. Fixes #3573 | |||||
| * | | Meaningful errors for unexpected partial arguments. Fixes #3573 | Tobias Svensson | 2011-11-19 | 1 | -0/+7 | |
| | | | ||||||
* | | | Don't html-escape the :count option to translate if it's a Numeric. Fixes #3685. | Jon Leighton | 2011-11-19 | 1 | -1/+11 | |
|/ / | ||||||
* | | Refactoring the redirect method for the router api. | Aaron Patterson | 2011-11-18 | 1 | -0/+5 | |
| | | ||||||
* | | remove the :path feature to redirects, since it cannot work | Aaron Patterson | 2011-11-18 | 1 | -33/+0 | |
| | | ||||||
* | | require that all blocks have arity of 2 | Aaron Patterson | 2011-11-18 | 1 | -1/+1 | |
| | | ||||||
* | | _html translation should escape interpolated arguments | lest | 2011-11-17 | 1 | -0/+6 | |
| | | ||||||
* | | Fix impractical I18n lookup in nested fields_for | Alexander Uvarov | 2011-11-17 | 1 | -0/+46 | |
| | | ||||||
* | | add test for bug fixed in 4f2bf64 | Andre Arko | 2011-11-14 | 1 | -0/+5 | |
| | | ||||||
* | | change tests to expect X-F-F over REMOTE_ADDR | Andre Arko | 2011-11-13 | 1 | -2/+2 | |
| | | ||||||
* | | Merge pull request #3592 from avakhov/av-highlight-regexp | José Valim | 2011-11-10 | 1 | -0/+4 | |
|\ \ | | | | | | | Fix and simplify highlight regexp | |||||
| * | | Fix and simplify highlight regexp | Alexey Vakhov | 2011-11-10 | 1 | -0/+4 | |
| | | | ||||||
* | | | Merge pull request #3581 from amatsuda/metal_response_body_19 | José Valim | 2011-11-10 | 1 | -0/+6 | |
|\ \ \ | |/ / |/| | | 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 Matsuda | 2011-11-10 | 1 | -0/+6 | |
| | | | | | | | | | | | | value in an Array in both Ruby 1.8 and 1.9 (refs #3581) | |||||
* | | | Fix trouble using :subdomain in development environment when using ↵ | Bradford Folkens | 2011-11-08 | 1 | -0/+11 | |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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' | |||||
* | | Revert "Skip test_default_external_works on the CI for Ruby 1.9.3." | Jon Leighton | 2011-11-06 | 1 | -11/+0 | |
| | | | | | | | | This reverts commit 10773f94eae0dacf10e2ed0c28f6bb73805c2521. | |||||
* | | Skip test_default_external_works on the CI for Ruby 1.9.3. | Jon Leighton | 2011-11-05 | 1 | -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') | |||||
* | | add tests for the case where size is explicitly passed to number_field helper | Vijay Dev | 2011-11-04 | 1 | -0/+4 | |
| | | ||||||
* | | Remove 'size' attribute from number_field form helper fixes #3454 | Waseem Ahmad | 2011-11-04 | 1 | -2/+2 | |
| | | | | | | | | | | 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 Leighton | 2011-11-03 | 1 | -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. | |||||
* | | Ensure that the format isn't applied twice to the cache key, else it becomes ↵ | Christopher Meiklejohn | 2011-10-31 | 1 | -0/+13 | |
| | | | | | | | | impossible to target with expire_action. | |||||
* | | Merge pull request #3435 from MDaubs/action_pack_deprecations | Santiago Pastorino | 2011-10-26 | 1 | -4/+4 | |
|\ \ | | | | | | | Fix deprecation warnings in action pack render tests | |||||
| * | | Fix deprecation warnings in action pack test suite due to passing template ↵ | Matthew Daubert | 2011-10-25 | 1 | -4/+4 | |
| | | | | | | | | | | | | formats in the template name. | |||||
* | | | Responders now return 204 No Content for API requests without a response ↵ | José Valim | 2011-10-26 | 1 | -10/+10 | |
| | | | | | | | | | | | | body (as in the new scaffold) | |||||
* | | | properly handle lists of lists. Thanks @adrianpike for reporting! | Aaron Patterson | 2011-10-25 | 1 | -0/+9 | |
|/ / | ||||||
* | | ActionPack test fix for RBX | Arun Agrawal | 2011-10-24 | 2 | -2/+9 | |
| | | ||||||
* | | Warnings removed from RequestIdTest | Arun Agrawal | 2011-10-22 | 1 | -2/+2 | |
| | | ||||||
* | | Add ActionDispatch::Session::CacheStore as a generic way of storing sessions ↵ | Brian Durand | 2011-10-21 | 1 | -0/+181 | |
| | | | | | | | | in a cache. | |||||
* | | Make tests run on 1.8.x, add integration setup. | José Valim | 2011-10-19 | 1 | -39/+45 | |
| | | ||||||
* | | Blah, SecureRandom#uuid is not supported in 1.8.7 -- cant wait for Rails 4.0 ↵ | David Heinemeier Hansson | 2011-10-19 | 1 | -1/+1 | |
| | | | | | | | | to drop compatibility with 1.8.x | |||||
* | | Added X-Request-Id tracking and TaggedLogging to easily log that and other ↵ | David Heinemeier Hansson | 2011-10-19 | 1 | -0/+59 | |
|/ | | | | production concerns | |||||
* | Symbol captures may generate multiple path segments, so don't escape / -> ↵ | Jeremy Kemper | 2011-10-13 | 1 | -7/+17 | |
| | | | | %2F. Test splat escaping. | |||||
* | / is allowed in URI fragments | Jeremy Kemper | 2011-10-13 | 1 | -2/+2 | |
| | ||||||
* | Failing tests for path parameter escaping | Jeremy Kemper | 2011-10-13 | 1 | -0/+27 | |
| | ||||||
* | Merge pull request #3314 from macmartine/master | Santiago Pastorino | 2011-10-13 | 1 | -0/+1 | |
|\ | | | | | Remove user-specified delimiter from start when no area code is present (in number_to_phone) | |||||
| * | remove user-specified delimiter from start when no area code is present (in ↵ | Mac Martine | 2011-10-12 | 1 | -0/+1 | |
| | | | | | | | | number_to_phone) |