José Valim
07f90f6bec
Merge branch 'exceptions' with the following features:
...
* A Railtie API for registering new exceptions and their respective status code (check Active Record railtie for an example)
* Extraction of ShowExceptions middleware logging and debugging features into a middleware called DebugExceptions
Conflicts:
actionpack/CHANGELOG.md
2011-12-01 21:18:47 +01:00
José Valim
6a4606d3a6
Remove unnecessary test setup.
2011-12-01 21:17:11 +01:00
José Valim
f9edc079e0
Split and improve show and debug exceptions middlewares.
2011-12-01 21:15:42 +01:00
José Valim
750bb5c865
Split ShowExceptions responsibilities in two middlewares.
2011-12-01 20:46:18 +01:00
David Heinemeier Hansson
83d29a283c
Revert "Added ActiveRecord::Base#last_modified to work with the new fresh_when/stale? conditional get methods from Action Pack"
...
Needless indirection with no added value.
This reverts commit 535853e83b
2011-12-01 20:45:47 +01:00
David Heinemeier Hansson
535853e83b
Added ActiveRecord::Base#last_modified to work with the new fresh_when/stale? conditional get methods from Action Pack
2011-12-01 19:47:14 +01:00
David Heinemeier Hansson
218c272938
Allow fresh_when/stale? to take a record instead of an options hash [DHH]
2011-12-01 19:16:10 +01:00
lest
565d92f578
fix method redefined warnings in tests
2011-11-30 18:57:12 +03:00
lest
a985309abc
fix warning in tests when using render_erb helper
2011-11-30 18:05:23 +03:00
lest
e975fe710a
test helpers in erb using erb
2011-11-30 17:38:09 +03:00
José Valim
38ab982cff
Log 'Filter chain halted as CALLBACKNAME rendered or redirected' every time a before callback halts.
2011-11-30 09:53:09 +01:00
Jon Leighton
7af719e81c
Deprecate set_sequence_name in favour of self.sequence_name=
2011-11-29 20:13:37 +00:00
Jon Leighton
0b72a04d0c
Deprecate set_table_name in favour of self.table_name= or defining your own method.
2011-11-29 20:13:36 +00:00
Marc-Andre Lafortune
d3bc12b27f
Handle correctly optional parameters for callable asset_host.
2011-11-29 02:01:18 -05:00
lest
fe7d4f09ef
put backtrace_cleaner to env
2011-11-28 19:25:37 +03:00
Vasiliy Ermolovich
fb8b555c49
add namespace options to form_for
...
You can provide a namespace for your form to ensure uniqueness of id attributes on form elements.
The namespace attribute will be prefixed with underscore on the generate HTML id
2011-11-27 23:41:23 +03:00
lest
bc81ba2451
fix label with block in erb
2011-11-27 16:59:44 +03:00
José Valim
0a4035b12a
Revert the serializers API as other alternatives are now also under discussion
2011-11-25 19:29:39 +00:00
José Valim
6f5fdf8179
Merge pull request #3747 from lest/middleware-logger
...
middlewares should have configurable logger
2011-11-25 05:33:26 -08:00
lest
cd9d28d6fd
middlewares should use logger from env
2011-11-25 13:09:46 +03:00
José Valim
fcacc6986a
Merge branch 'serializers'
...
This implements the ActiveModel::Serializer object. Includes code, tests, generators and guides.
From José and Yehuda with love.
Conflicts:
railties/CHANGELOG.md
2011-11-25 09:59:35 +00:00
José Valim
7fcc8c0a1f
Rely solely on active_model_serializer and remove the fancy constant lookup.
2011-11-23 23:45:27 +00:00
lest
98a1717e7c
configuration option to always write cookie
2011-11-23 23:50:04 +03:00
José Valim
e62de52aa3
Merge branch 'master' into serializers
2011-11-23 20:43:06 +00:00
Yehuda Katz
e9f63c55f8
Merge pull request #3733 from kennyj/fix_warnings_for_show_exceptions_test
...
Warnings removed. (ambiguous first argument)
2011-11-23 11:10:27 -08:00
José Valim
fd86a1b6b0
Rely on a public contract between railties instead of accessing railtie methods directly.
2011-11-23 19:06:45 +00:00
kennyj
ea70e027b6
Remove unreachable code, and add additional testcases.
2011-11-24 00:25:34 +09:00
kennyj
453f5534b4
Warnings removed. (ambiguous first argument)
2011-11-24 00:10:34 +09:00
José Valim
b13b49ccc1
Merge pull request #3718 from lest/fix-javascript-include-tag
...
javascript_include_tag should add '.js' to sources that contain '.'
2011-11-22 09:45:11 -08:00
lest
aa491f6a9c
javascript_include_tag should add '.js' to sources that contain '.'
2011-11-22 16:39:07 +03:00
lest
5bcd119b8d
move show_detailed_exceptions? to Rescue module
2011-11-22 13:34:13 +03:00
lest
c6d6b28bb4
refactor show exceptions tests
2011-11-22 11:38:55 +03:00
lest
a9e8cf78fd
add ActionController::Metal#show_detailed_exceptions?
2011-11-22 11:38:24 +03:00
Yehuda Katz
bc04455f10
Merge pull request #3695 from tobiassvn/partial_path_error
...
Meaningful errors for unexpected partial arguments. Fixes #3573
2011-11-19 07:38:22 -08:00
Jon Leighton
603a679e87
Don't html-escape the :count option to translate if it's a Numeric. Fixes #3685 .
2011-11-19 13:28:07 +00:00
Tobias Svensson
771635e858
Meaningful errors for unexpected partial arguments. Fixes #3573
2011-11-19 13:05:57 +00:00
Aaron Patterson
99d94f126d
Refactoring the redirect method for the router api.
2011-11-18 10:51:12 -08:00
Aaron Patterson
0809c675ef
remove the :path feature to redirects, since it cannot work
2011-11-18 10:51:11 -08:00
Aaron Patterson
4589b2419b
require that all blocks have arity of 2
2011-11-18 10:51:11 -08:00
lest
e8d57f361a
_html translation should escape interpolated arguments
2011-11-17 23:07:39 +00:00
Alexander Uvarov
c2b6f63bbe
Fix impractical I18n lookup in nested fields_for
2011-11-17 12:37:00 +06:00
Andre Arko
b8c85de620
add test for bug fixed in 4f2bf64
2011-11-14 12:29:51 -10:00
Andre Arko
8f0085a483
change tests to expect X-F-F over REMOTE_ADDR
2011-11-13 10:19:54 -10:00
José Valim
bdd76fb5e3
Merge pull request #3592 from avakhov/av-highlight-regexp
...
Fix and simplify highlight regexp
2011-11-10 02:53:43 -08:00
José Valim
d2cfa982fd
Merge pull request #3581 from amatsuda/metal_response_body_19
...
AC::Metal#response_body= stores different value in Ruby 1.8 and 1.9
2011-11-10 00:49:14 -08:00
Alexey Vakhov
b5c3987294
Fix and simplify highlight regexp
2011-11-10 11:26:42 +04:00
Akira Matsuda
be7ab83b64
A test case to ensure that AC::Metal#response_body= always wraps the given value in an Array in both Ruby 1.8 and 1.9 (refs #3581 )
2011-11-10 10:54:56 +09:00
Bradford Folkens
bd559b0068
Fix trouble using :subdomain in development environment when using 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'
2011-11-08 07:52:35 -06:00
Jon Leighton
7776055e2d
Revert "Skip test_default_external_works on the CI for Ruby 1.9.3."
...
This reverts commit 10773f94ea
2011-11-06 10:39:59 +00:00
Jon Leighton
10773f94ea
Skip test_default_external_works on the CI for Ruby 1.9.3.
...
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')
2011-11-05 16:42:53 +00:00
