github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-08 21:25:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,204 Commits 34 Branches 105 Tags
2dcdcf1552748f331bf6f6194ffddabd837bcac9
Commit Graph

1532 Commits

Author SHA1 Message Date
Joshua Peek
2092687bcb Ensure content type gets reset after render_to_string [#1182 state:resolved] 2008-10-30 15:26:29 -05:00
David Heinemeier Hansson
7857e42103 Merge branch 'master' of git@github.com:rails/rails 2008-10-30 21:11:46 +01:00
Seth Fitzsimmons
47b4fa4a62 Fixed regex in redirect_to to fully support URI schemes [#1247 state:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-10-30 21:07:50 +01:00
Joshua Peek
ec38c84ce1 Dup local assigns for partial collections so nil values doesn't get overwritten [#1250 state:resolved] 2008-10-30 15:07:47 -05:00
David Heinemeier Hansson
4dbfe18b37 Proper API for reloading translations 2008-10-29 10:51:56 +01:00
Ryan Bates
4ad5aa9a39 Ensure @content_for_* is checked before yielding to block in render :layout [#8994 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-10-28 17:31:33 -05:00
Joshua Peek
ac50ee0edf Track rendered templates in stack so the current template can always be accessed. Added ActionView::Base#template to access the template object. 2008-10-28 11:06:08 -05:00
Erik Andrejko
ef9b6b5cba modified current_page? to ignore extra parameters unless specified in options 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#805 state:committed]
 2008-10-26 19:14:45 +01:00
David Heinemeier Hansson
2c7abe1b56 Fixed bug with asset timestamping when using relative_url_root (Joe Goldwasser) [#1265 status:committed] 2008-10-26 16:50:18 +01:00
Jeffrey Hardy
3bcadc9290 Fix incorrect closing CDATA delimiter. Add tests for CDATA nodes. 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-10-23 19:16:26 -07:00
Jeffrey Hardy
1a18227261 Fix that HTML::Node.parse would blow up on unclosed CDATA sections. 
If an unclosed CDATA section is encountered and parsing is strict, an
exception will be raised. Otherwise, we consider the remainder of the line to
be the section contents. This is consistent with HTML::Tokenizer#scan_tag.

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-10-23 19:16:12 -07:00
David Heinemeier Hansson
18542c9e00 Dont try to auto-set the etag based on the body if any freshness headers have already been set [DHH/José Valim] 2008-10-21 16:58:12 +02:00
David Heinemeier Hansson
448e7e7c04 Let fresh_when actually do the head(:not_modified). Cleaner and we get the filter halting for free then. 2008-10-21 02:54:55 +02:00
David Heinemeier Hansson
68d84e2593 Merge branch 'master' of git@github.com:rails/rails 2008-10-21 02:30:57 +02:00
David Heinemeier Hansson
9acb88e666 Added stale?/fresh? and fresh_when methods to provide a layer of abstraction above request.fresh? and friends [DHH] 2008-10-21 02:30:13 +02:00
Tim Harper
fcb45e5ec3 Ensure ActionView::Helpers::AssetTagHelper::AssetTag::Cache is cleared before loading so changes to asset files are picked up by the broswer [#1233 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-10-20 13:21:59 -05:00
David Heinemeier Hansson
1abdc8752d Added inline builder yield to atom_feed_helper tags where appropriate (Sam Ruby) [#8994 status:committed] 2008-10-13 19:52:37 +02:00
Matthew M. Boedicker
42cbd710bb Add support for xml processing instructions in atom_feed_helper [#926 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-10-13 18:46:32 +02:00
Eloy Duran
b47c76b1df Make sure named routes with parameters can be used in tests before a request has been done. [#1208 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-10-13 18:38:48 +02:00
Tom Stuart
e28ad77bba Allow use of :path_prefix and :name_prefix outside of namespaced routes. [#1188 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-10-08 14:56:52 +01:00
Michael Koziarski
aec391621b Make sure last_modified! works with <= rather than just equality. 2008-10-07 21:09:07 +02:00
Andrew Kaspick
dce6ade4cd Ensure select_tag#name attribute uses [] when :multiple is true. [#1146 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-10-07 15:17:22 +01:00
Tarmo Tänav
51b986619d Implement submit_to_remote as a wrapper around a more generic button_to_remote 
Removed the "return false" from submit_to_remote onclick end as
button input elements have no default behavior to cancel.

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-10-07 00:12:20 +01:00
madlep
8e50f0f96e Fix image_tag behavior on windows. [#1085 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-10-06 23:43:41 +01:00
Pratik Naik
5e3517ea7b Ensure rescue_from handlers are respected inside tests. [#835 state:resolved] 
Note : If you're not using rescue_from, you should overrider rescue_action_without_handler() method
and not rescue_action(). Afterwards, you can set request.remote_addr to a non "0.0.0.0" value for testing the
overridden behavior.
 2008-10-04 18:43:46 +01:00
madlep
2def5b6314 Fixed load path for actionmailer and activesupport tests to always load from local lib files. 
[#983 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-10-04 07:57:18 -07:00
Michael Koziarski
0eefa7058a Fix etag! and last_modified! to work as advertised. 
Add tests too.
 2008-09-30 17:00:38 +02:00
Andrew Kaspick
8c105ee0c8 Add options to field_set_tag 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1116 state:committed]
 2008-09-29 17:47:29 +02:00
Martin Rehfeld
10380a22a6 Fixed AssetTag cache with with relative_url_root [#1022 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-09-22 13:23:23 -05:00
Joshua Peek
900fd6eca9 Refactor AssetTagHelper and fix remaining threadsafe issues. 2008-09-22 13:12:32 -05:00
Claudio Poli
5f83e1844c Fixed missing template paths on exception [#1082 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-09-20 22:57:45 -05:00
Michael Koziarski
2d27b82d4c Remove the country_select helper. 
We're in no position to mediate disputes on this matter, and the previous change to use ISO 3166 has offended just as many people as the ad-hoc list did.

If you want the old list back you can install the plugin:

ruby script/plugin install git://github.com/rails/country_select.git
 2008-09-18 21:30:52 +02:00
Pelle Braendgaard
7ecb9689b0 Added support for http_only cookies in cookie_store Added unit tests for secure and http_only cookies in cookie_store 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1046 state:committed]
 2008-09-17 13:20:16 +02:00
Sven Fuchs
a18ed6d563 Added ActionController::Translation module delegating to I18n #translate/#t and #localize/#l [status:committed #1008] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-09-10 00:39:54 -05:00
Alastair Brunton
b141624abb Added image_submit_tag confirm option [status:committed #784] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-09-10 00:13:35 -05:00
Jose Fernandez
184cf27b12 The FormTagHelper#submit_tag helper will now pass along the original value of the submit button to the params if the :disable_with option is used [status:committed #633] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-09-10 00:02:23 -05:00
Matt Jones
7e6cda15f8 Ensure routing optimizations are cleared when new routes are added [#981 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-09-07 10:21:34 -05:00
Jonathan del Strother
6cfb70023a Don't set Content-Length on 304 responses 
Commit 8aad8c claimed to do this, but it checks for the 304 status too early, before handle_conditional_get! has overridden it.

[#958 state:resolved]

Signed-off-by: Jonathan del Strother <jon.delStrother@bestbefore.tv>
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-09-02 22:57:40 +02:00
Jeremy Kemper
a1eb4e11c2 Get rid of 'Object#send!'. It was originally added because it's in Ruby 1.9, but it has since been removed from 1.9. 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>

Conflicts:

	actionpack/test/controller/layout_test.rb
 2008-08-31 13:20:15 -07:00
Luke Melia
7ce03db778 Fixes optimised named routes generating question mark followed by nothing when provided an empty hash as the last argument. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#481 state:committed]
 2008-08-31 19:42:01 +02:00
Joshua Peek
086c3520c4 Moved layout exemption logic into the view 2008-08-31 11:34:46 -05:00
Pratik Naik
56c2b02f59 Fix AM tests and add tests for rendering logging 2008-08-31 16:29:21 +01:00
Pratik Naik
a59a3db1f3 Move copying ivar logic from ActionController::Base to ActionView::Base 2008-08-31 03:48:09 +01:00
miloops
367a55e1b8 Allow prototype functions to receive position parameter as a symbol. 
[#887 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-08-30 16:35:25 -07:00
Pratik Naik
4fb75392aa Add test to make sure RJS block inside controller is executed in view context 2008-08-30 21:47:35 +01:00
Pratik Naik
83c6ba1889 Add support for shallow nesting of routes. [#838 state:resolved] 
Adds :shallow option to resource route definition. If true, paths for nested
resources which reference a specific member (ie. those with an :id parameter)
will not use the parent path prefix or name prefix.

Example :

map.resources :users, :shallow => true do |user|
  user.resources :posts
end

* GET /users/1/posts (maps to PostsController#index action as usual)
  named route "user_posts" is added as usual.

* GET /posts/2 (maps to PostsController#show action as if it were not nested)
  Additionally, named route "post" is added too.
 2008-08-30 15:20:20 +01:00
miloops
11eb29f60a Make assert_select_rjs code more readable, make use of unused constants and use more simple Regexps. 
[#540 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-08-29 17:52:26 -07:00
Tarmo Tänav
6450d6ca76 Added button_to_remote helper 
Ticket originally from http://dev.rubyonrails.org/ticket/3641

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-08-29 16:22:01 -07:00
Tom Lea
db26b47b9f Ensure that calling content_tag_for in a helper doesn't cause duplicate output. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#871 state:committed]
 2008-08-29 20:52:01 +02:00
Tim Haines
d0b949d873 Improve assert_select_rjs failure messages for show, hide, toggle, and remove 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#931 state:committed]
 2008-08-29 20:51:47 +02:00