Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | concat should ignore nil | Jeremy Kemper | 2008-06-06 | 1 | -0/+8 |
| | |||||
* | javascript_tag should only concat when block_given? | Jeremy Kemper | 2008-06-06 | 1 | -0/+4 |
| | |||||
* | Merge branch 'master' into erbout | Jeremy Kemper | 2008-06-05 | 2 | -2/+13 |
|\ | |||||
| * | Ensure render :file works inside templates | Pratik Naik | 2008-06-05 | 2 | -0/+11 |
| | | |||||
| * | Make partial counter start from 0. | Frederick Cheung | 2008-06-05 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | Merge branch 'master' into erbout | Jeremy Kemper | 2008-06-05 | 2 | -4/+9 |
|\| | |||||
| * | Use CGI::Cookie::parse for request cookies until we officially deprecated CGI. | Joshua Peek | 2008-06-04 | 1 | -4/+4 |
| | | |||||
| * | Add RJS#page.reload. [#277 state:resolved] | Sean Huber | 2008-06-04 | 1 | -0/+5 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | Merge branch 'master' into erbout | Jeremy Kemper | 2008-06-03 | 6 | -8/+43 |
|\| | |||||
| * | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-06-03 | 1 | -3/+20 |
| |\ | |||||
| | * | Fix assert_redirected_to for nested controllers and named routes | Gabe da Silveira | 2008-06-04 | 1 | -3/+20 |
| | | | | | | | | | | | | | | | | | | [#308 state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | | Fixed Request#remote_ip to only raise hell if the HTTP_CLIENT_IP and ↵ | David Heinemeier Hansson | 2008-06-03 | 1 | -0/+3 |
| |/ | | | | | | | HTTP_X_FORWARDED_FOR doesnt match (not just if theyre both present) [Mark Imbriaco, Bradford Folkens] | ||||
| * | Allow caches_action to accept a layout option [#198 state:resolved] | josevalim | 2008-06-03 | 1 | -0/+15 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Namespace Inflector, Dependencies, OrderedOptions, and TimeZone under ↵ | Joshua Peek | 2008-06-03 | 3 | -5/+5 |
| | | | | | | | | ActiveSupport [#238 state:resolved] | ||||
* | | Stack @output_buffer for nested rendering | Jeremy Kemper | 2008-06-03 | 1 | -1/+1 |
| | | |||||
* | | Work with @output_buffer instead of _erbout | Jeremy Kemper | 2008-06-02 | 9 | -193/+195 |
|/ | |||||
* | Ensure Rack processor reads CGI output_cookies for the session cookie. | Joshua Peek | 2008-06-02 | 1 | -4/+52 |
| | |||||
* | Added Rack processor | Ezra Zygmuntowicz | 2008-06-01 | 2 | -0/+183 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Remove dead code, and the tests for it. | Michael Koziarski | 2008-05-31 | 1 | -192/+0 |
| | |||||
* | Remove superfluous tests directive | Jeremy Kemper | 2008-05-26 | 1 | -2/+0 |
| | |||||
* | Fix auto_link helper for already linked urls. [#72 state:resolved] | Kevin Glowacz | 2008-05-22 | 1 | -0/+1 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Parentheses should be acceptable characters for auto_link_urls. [#234 ↵ | Adam | 2008-05-22 | 1 | -0/+1 |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Improve check_box_checked? to use include? for Array values. [#193 ↵ | Erkki Eilonen | 2008-05-21 | 1 | -0/+11 |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Ruby 1.9 compat: ensure binary encoding for post body parsing | Jeremy Kemper | 2008-05-19 | 1 | -5/+15 |
| | |||||
* | Ruby 1.9 compat: qualify module name within module_evaled block | Jeremy Kemper | 2008-05-19 | 1 | -1/+1 |
| | |||||
* | Test for assert_response for failure response without an exception. [#141 ↵ | Chris Hapgood | 2008-05-19 | 1 | -0/+14 |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Add fragment_exist? and exist? methods to cache stores. [#203 state:resolved] | José Valim | 2008-05-19 | 1 | -20/+22 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Ensure observe_field encodes value parameter. [#216 state:resolved] | Frederick Cheung | 2008-05-19 | 1 | -2/+2 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | InstanceTag#default_time_from_options overflows to DateTime | gbuesing | 2008-05-18 | 1 | -0/+6 |
| | |||||
* | Ensure routing generator works with non-string keys. [#172 state:resolved] | Sven Fuchs | 2008-05-16 | 1 | -0/+7 |
| | | | | | | | | | | Make sure that (with recent correction to globbed parameter escaping) non-string values can still be passed route generation helpers for globbed route segments. For example, foo_path([1, 2, 3]) should still work for a route like map.foo "*globbed" by implicitely calling to_s on the Fixnums. Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | auto_link helper fails to recognize links separated by space. [#72 ↵ | Eugene Pimenov | 2008-05-16 | 1 | -0/+1 |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Adding an example test case for pluralize for (y) -> (ies) | Robby Russell | 2008-05-14 | 1 | -0/+2 |
| | |||||
* | Don't fallback to just adding "'s" in TextHelper#pluralize, because the ↵ | Joshua Peek | 2008-05-14 | 1 | -25/+14 |
| | | | | Inflector is always loaded. | ||||
* | One last fix to test_filter_parameters_is_protected. | Joshua Peek | 2008-05-14 | 1 | -1/+1 |
| | |||||
* | Clean up previously commited test. | Joshua Peek | 2008-05-14 | 1 | -2/+2 |
| | |||||
* | Improve test coverage for filter_parameters [José Valim] | Joshua Peek | 2008-05-14 | 1 | -3/+3 |
| | |||||
* | Protect #filter_parameters created by filter_parameter_logging [José Valim] ↵ | Joshua Peek | 2008-05-14 | 1 | -7/+13 |
| | | | | [#196 state:resolved] | ||||
* | Added conditional support to caches_action [José Valim] [#166 state:resolved] | Joshua Peek | 2008-05-14 | 1 | -13/+67 |
| | |||||
* | make CGI::Cookie handle deleting a cookie properly | Rich Cavanaugh | 2008-05-13 | 1 | -0/+1 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Fix remote_function to escape apostrophes inside the remote url passed to ↵ | Andre Arko | 2008-05-13 | 1 | -0/+5 |
| | | | | | | Ajax.Update. [#180 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Merge branch 'master' of git@github.com:rails/rails | rick | 2008-05-13 | 5 | -2/+75 |
|\ | |||||
| * | Don't double-escape cookie store data. Don't split cookie values with ↵ | Rich Cavanaugh | 2008-05-12 | 2 | -2/+19 |
| | | | | | | | | | | | | newlines into an array. [#130 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Bug: Earlier Check for Session in Forgery Protection | Peter Jones | 2008-05-11 | 1 | -0/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The session is used by the form_authenticity_token method before it is tested to be valid. This patch moves a few lines around so that the session is validated first. Without this patch, if you try to use forgery protection with sessions turned off, you get this exception message: undefined method `session_id' for {}:Hash The patch includes a test that can be used to see this behavior before the request_forgery_protection.rb file is patched to fix it. | ||||
| * | Added session(:on) to turn session management back on in a controller ↵ | David Heinemeier Hansson | 2008-05-11 | 1 | -0/+22 |
| | | | | | | | | subclass if the superclass turned it off (Peter Jones) [#136 state:resolved] | ||||
| * | Fixed flash.now not being accessible in tests. Flash sweeping is now done ↵ | Andreas Neuhaus | 2008-05-11 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | before action processing instead after Signed-off-by: Michael Koziarski <michael@koziarski.com> [#10 state:resolved] | ||||
* | | fix merge conflict with actionpack changelog | rick | 2008-05-10 | 6 | -51/+257 |
|\| | |||||
| * | Make render shorthands work with namespaced controllers | Jacek Becela | 2008-05-10 | 2 | -42/+183 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Escape globbed parameters in routes correctly. | Chris Roos | 2008-05-10 | 1 | -5/+7 |
| | | | | | | | | | | | | :controller => 'glob', :action=> 'show', :additional => ['foo/bar', 'baz'] Should generate /glob/show/foo%2Fbar/baz not /glob/show/foo/bar/baz | ||||
| * | ActionView::InstanceTag#default_time_from_options with hash args uses ↵ | gbuesing | 2008-05-08 | 1 | -0/+23 |
| | | | | | | | | Time.current as default; respects hash settings when time falls in system local spring DST gap | ||||
| * | Adding Date.current, which returns Time.zone.today if config.time_zone is ↵ | gbuesing | 2008-05-08 | 1 | -0/+9 |
| | | | | | | | | set; otherwise returns Date.today. ActionView date_helper uses Date.current to determine locale-appropriate default |