Commit Graph

2223 Commits

Author SHA1 Message Date
Jeremy Kemper
cf2ee1451b Fix silent failure of rxml templates. Closes #9879.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7921 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-15 20:30:48 +00:00
Michael Koziarski
fe234a1538 Fix Json related documentation for render and the AR serializer. Closes #9814. Closes #9833. [chuyeow]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7905 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-15 07:04:10 +00:00
Michael Koziarski
3353b85b0e Sync country_select with ISO 3166 long names. Closes #6872 [abhay, mikong, ruben]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7904 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-15 06:52:00 +00:00
Michael Koziarski
61639262f1 Enhance documentation for observe_field. Closes #9808 [RubyRedRick, danger]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7901 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-15 05:03:23 +00:00
Jeremy Kemper
ae8179f05c Expand Routes::DynamicSegment test coverage. Closes #7122 [Kevin Clark]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7898 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-15 04:27:31 +00:00
Jeremy Kemper
86a9c212c0 Skip memcache tests unless it's installed
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7893 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-15 01:47:35 +00:00
Jeremy Kemper
6e56cc013f Wrap test with uses_mocha
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7888 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-14 22:54:28 +00:00
Jeremy Kemper
d0df7f2b12 Memcached sessions: add session data on initialization; don't silently discard exceptions; add unit tests. Closes #9823.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7885 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-14 20:46:06 +00:00
Jeremy Kemper
a0bcb45b09 non-executable
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7884 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-14 20:45:48 +00:00
Jeremy Kemper
01cfda7cf2 error_messages_for also takes :message and :header_message options which defaults to the old "There were problems with the following fields:" and "<count> errors prohibited this <object_name> from being saved". Closes #8270.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7870 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-14 02:59:32 +00:00
Michael Koziarski
52235a70db Missed post_via_redirect. References #6834
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7851 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-13 03:34:24 +00:00
Michael Koziarski
569c7d5488 Define get_via_redirect as well. Closes #6834 [colthorp]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7850 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-13 03:32:20 +00:00
Michael Koziarski
bd03bf9f5e Make sure that custom inflections are picked up by map.resources by triggering a routing reload when new inflections are defined. Closes #9815 [mislav, kampers]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7849 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-13 03:28:35 +00:00
David Heinemeier Hansson
faff774f9d Update versions here too
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7843 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-12 16:03:54 +00:00
Jeremy Kemper
21b51eda63 JavaScriptVariableProxy#to_json ignores the options arg
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7831 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-11 00:21:59 +00:00
David Heinemeier Hansson
6637f9069c Extracted sanitization methods from TextHelper to SanitizeHelper [DHH] Changed SanitizeHelper#sanitize to only allow the custom attributes and tags when specified in the call [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7825 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-10 17:35:10 +00:00
Jeremy Kemper
4db4661a67 rescue_from accepts :with => lambda { |exception| ... } or a normal block. Closes #9827.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7822 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-10 02:34:42 +00:00
Michael Koziarski
4aabe46341 Add :status to redirect_to allowing users to choose their own response code without manually setting headers. Closes #8297 [codahale, chasgrundy]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7820 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-09 23:07:36 +00:00
Michael Koziarski
c2602354d1 form_for example for namespaced routes. Closes #9769 [sjgman9]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7799 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-08 05:50:59 +00:00
Jeremy Kemper
931be6ed1b 1 years -> 1 year
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7794 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-08 03:46:23 +00:00
Jeremy Kemper
8a2fa23cd1 Add tests for [7727]. Closes #6090 [dkubb, mpalmer, tarmo]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7793 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-08 03:33:30 +00:00
Michael Koziarski
074fe35b8a Add link_to :back which uses your referrer with a fallback to a javascript link. #7366 [eventualbuddha, tarmo]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7791 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-08 03:30:29 +00:00
Jeremy Kemper
459cc1ecb8 error_messages_for and friends also work with local variables. Closes #9699.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7779 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-07 19:50:30 +00:00
Jeremy Kemper
d9f3c435f9 Fix url_for, redirect_to, etc. with :controller => :symbol instead of 'string'. Closes #8562, #9525.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7776 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-07 19:12:02 +00:00
Jeremy Kemper
845e6ff45a String#to_xs uses the fast_xs extension if available for Builder speedup.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7773 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-07 09:15:26 +00:00
Jeremy Kemper
4430a00c04 BlankSlate -> BasicObject
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7772 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-07 06:45:01 +00:00
Jeremy Kemper
52ca5dad1e Use StringIO and Tempfile subclasses instead of defining singleton methods on each multipart field.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7759 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-06 11:40:13 +00:00
Jeremy Kemper
3405fb3dea Rewind stdin if possible after multipart parsing.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7758 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-06 09:39:31 +00:00
Jeremy Kemper
551f6e9bee Don't generate strings to log unless they'll actually get logged.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7757 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-06 09:28:50 +00:00
Jeremy Kemper
89eb53395b Typo
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7756 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-06 01:38:58 +00:00
Jeremy Kemper
fe0df25f7b Move misplaced CHANGELOG entry
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7755 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-06 01:26:48 +00:00
Jeremy Kemper
335c15005d Bump versions for 1.2.4 release.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7744 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-05 05:20:37 +00:00
Jeremy Kemper
12d740dd57 Move #query_string to AbstractRequest
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7727 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-03 16:39:18 +00:00
Rick Olson
3dc62ab8f9 rescue LoadError if memcache isn't available while loading the MemCache fragment store
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7726 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-03 16:15:42 +00:00
Rick Olson
408f496402 Use #require_library_or_gem to load the memcache library for the MemCache session and fragment cache stores. Closes #8662. [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7725 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-03 14:52:56 +00:00
Rick Olson
904df818d6 Move ActionController::Routing.optimise_named_routes to ActionController::Base.optimise_named_routes. Now you can set it in the config.
ActionController::Routing::DynamicSegment#interpolation_chunk should call #to_s on all values before calling URI.escape.  [Rick]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7724 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-03 05:47:41 +00:00
Michael Koziarski
eb5033ad6b Merge session fixation fixes from stable
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7722 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-02 05:58:16 +00:00
Jeremy Kemper
0ee1cb2cd3 Ruby 1.9 compat, consistent load paths
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7719 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-10-02 05:32:14 +00:00
David Heinemeier Hansson
860cf2d44e Fixed that render template did not honor exempt_from_layout (closes #9698) [pezra]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7701 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-30 22:59:24 +00:00
David Heinemeier Hansson
81da956188 Docfix (closes #9740) [chuyeow]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7699 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-30 22:55:39 +00:00
David Heinemeier Hansson
7275d2749c Fixed JSON encoding to use quoted keys according to the JSON standard (closes #8762) [choonkat/chuyeow]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7697 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-30 20:57:50 +00:00
David Heinemeier Hansson
752721c072 Updated
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7684 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-29 22:13:10 +00:00
David Heinemeier Hansson
8e067b0b44 Fixed that a response has to be available for that exact mime type for it to be called (otherwise 406 should occur)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7681 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-29 21:56:21 +00:00
David Heinemeier Hansson
826f0bd42f Fixed that strip_tags blows up with invalid html (closes #9730) [lifo]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7677 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-29 20:19:33 +00:00
Michael Koziarski
4953563e08 Ensure request is present, as well as defined. [nzkoz]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7676 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-29 02:19:16 +00:00
Michael Koziarski
9660360d6b Re-enable Routing optimisation code for _url methods, add defined?(request) to the guard conditions
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7673 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-28 20:57:39 +00:00
Rick Olson
82ff27766d Better error messages if you leave out the :secret option for request forgery protection. Closes #9670 [rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7671 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-28 16:50:48 +00:00
Michael Koziarski
c1bdf027d8 Add missing require
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7670 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-28 16:48:59 +00:00
Rick Olson
5edc81dcc2 Allow ability to disable request forgery protection, disable it in test mode by default. Closes #9693 [lifofifo]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7668 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-28 15:55:45 +00:00
David Heinemeier Hansson
e3b49c052b Fixed spelling errors (closes #9706) [tarmo/rmm5t]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7666 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-28 14:18:47 +00:00