Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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> | ||||
* | 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 | 4 | -9/+78 |
|\| | |||||
| * | Make render shorthands work with namespaced controllers | Jacek Becela | 2008-05-10 | 1 | -0/+36 |
| | | | | | | | | 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 | ||||
| * | Delegate action_name to controller inside views. | Pratik Naik | 2008-05-06 | 1 | -0/+9 |
| | | |||||
| * | Refactored and fixed Resources.map_member_actions to make use of custom ↵ | Marcos Arias | 2008-05-06 | 1 | -4/+26 |
| | | | | | | | | | | | | | | ActionController::Base.resources_path_names when the option :path_names is not directly specified. Added a specific test for this functionality and fixed assert_restful_routes_for test helper to make use of ActionController::Base.resources_path_names instead of just "new" or "edit". Signed-off-by: Michael Koziarski <michael@koziarski.com> [#111 state:resolved] | ||||
* | | change ActionController::RequestForgeryProtection to use ↵ | rick | 2008-05-06 | 2 | -7/+66 |
| | | | | | | | | Mime::Type#verify_request? [#73] | ||||
* | | Change the request forgery protection to go by Content-Type instead of ↵ | rick | 2008-05-06 | 1 | -4/+25 |
|/ | | | | request.format so that you can't bypass it by POSTing to "#{request.uri}.xml" [#73 state:resolved] | ||||
* | regression test for bug introduced in ↵ | rick | 2008-05-05 | 1 | -0/+13 |
| | | | | [6a6b4392c16c665eb713705f2b38e959a658eeef] [Ian White] [#22 state:resolved] | ||||
* | Allow ActionController::Base#default_url_options to have a default options ↵ | Cheah Chu Yeow | 2008-05-05 | 1 | -1/+1 |
| | | | | | | argument of nil. This fixes a bug introduced in [6a6b4392c16c665eb713705f2b38e959a658eeef] which was breaking routing in ActionController::UrlWriter. | ||||
* | Ensure that default_url_options, if defined, are used in named routes. | Cheah Chu Yeow | 2008-05-04 | 1 | -0/+34 |
| | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#22 state:resolved] | ||||
* | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-05-01 | 1 | -0/+7 |
|\ | |||||
| * | Accept header mime parser can now deal with empty fields | Tobias Lütke | 2008-05-01 | 1 | -0/+7 |
| | | |||||
* | | Made the location of the routes file configurable with ↵ | David Heinemeier Hansson | 2008-05-01 | 1 | -0/+10 |
|/ | | | | config.routes_configuration_file (Scott Fleckenstein) [#88 state:resolved] | ||||
* | Fixed render :template for templates in top level of view path. [#54 ↵ | Pratik Naik | 2008-05-01 | 1 | -0/+20 |
| | | | | state:resolved] | ||||
* | Implement increment/decrement on cache storage engines, using read/write by ↵ | Tobias Lütke | 2008-04-29 | 1 | -3/+2 |
| | | | | default and using atomic command on memcache | ||||
* | Ruby 1.9 compat: force assert_select text encoding to the encoding of the ↵ | Jeremy Kemper | 2008-04-28 | 1 | -4/+11 |
| | | | | regexp it's matching against. | ||||
* | Make sure member names aren't mistakenly set to nil when providing :path_names | Eugene Pimenov | 2008-04-23 | 1 | -7/+38 |
| | | | | | | [#19 state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Delegate ivars to controller instead of copying | Pratik Naik | 2008-04-21 | 1 | -4/+15 |
| | | | | | Reduce number of instance variables being copied from controller to view. Instead, delegate them to controller instance. | ||||
* | Remove ActionController::Base#view_controller_internals | Pratik Naik | 2008-04-21 | 1 | -16/+0 |
| | | | | | | Get rid of ActionController::Base#view_controller_internals flag and use @@protected_view_variables for storing the list of controller specific instance variables which should be inaccessible inside views. | ||||
* | Add conditional options to caches_page method [#25 state:resolved] | Paul Horsfall | 2008-04-19 | 1 | -1/+8 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Move missing template logic to ActionView | Pratik Naik | 2008-04-19 | 6 | -7/+7 |
| | |||||
* | Introduce ActionView::InlineTemplate class | Pratik Naik | 2008-04-19 | 1 | -3/+3 |
| | |||||
* | Refactor Dispatcher callbacks to remove unnecessary Dependencies checks in ↵ | Pratik Naik | 2008-04-18 | 1 | -38/+17 |
| | | | | production environment. | ||||
* | Stub out Dispatcher#log_failsafe_exception method to please the test gods. | Joshua Peek | 2008-04-15 | 1 | -3/+6 |
| | |||||
* | Added Rails.public_path to control where HTML and assets are expected to be ↵ | David Heinemeier Hansson | 2008-04-13 | 1 | -4/+20 |
| | | | | loaded from (defaults to Rails.root + "/public") #11581 [nicksieger] | ||||
* | Merge branch 'master' into custom_paths_for_resource_names | Michael Koziarski | 2008-04-12 | 1 | -1/+1 |
|\ | |||||
| * | stub the instance method, there is no class method | Jeremy Kemper | 2008-04-11 | 1 | -1/+1 |
| | | |||||
* | | Allow alternative values for the 'new' and 'edit' actions in resourceful routes. | Michael Koziarski | 2008-04-12 | 1 | -0/+6 |
|/ | | | | | | map.resource :schools, :as => 'escuelas', :path_names => { :new => 'nueva' } Closes #11181. [ivanvr] | ||||
* | Fixed that formatted_polymorphic_route should be able to take the :format as ↵ | David Heinemeier Hansson | 2008-04-11 | 1 | -3/+8 |
| | | | | part of a single hash or as the option hash (references #8741) | ||||
* | Automatically parse posted JSON content for Mime::JSON requests. [rick] | Rick Olson | 2008-04-08 | 1 | -1/+22 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9242 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Provide a helper proxy to access helper methods from outside views. Closes ↵ | Josh Peek | 2008-04-06 | 1 | -0/+16 |
| | | | | | | #10839 [Josh Peek] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9234 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Ensure RJS redirect_to doesn't html-escapes string argument. Closes #8546 | Pratik Naik | 2008-04-02 | 1 | -0/+20 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9212 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Ruby 1.9 compat: encoding and multibyte test fixes | Jeremy Kemper | 2008-04-01 | 1 | -2/+4 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9194 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Ruby 1.9 compat: proc arity | Jeremy Kemper | 2008-04-01 | 1 | -4/+4 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9190 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | style & whitespace | Jeremy Kemper | 2008-04-01 | 1 | -8/+4 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9189 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Ruby 1.9: no args is 0 arity, not -1 as in 1.8 | Jeremy Kemper | 2008-04-01 | 1 | -2/+2 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9187 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Support render :partial => collection of heterogeneous elements. Closes #11491. | Jeremy Kemper | 2008-04-01 | 2 | -0/+26 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9177 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Avoid remote_ip spoofing | Jeremy Kemper | 2008-03-28 | 1 | -2/+23 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9124 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Fix layouts in symlinked paths. Closes #9136 [court3nay, caio] | Jeremy Kemper | 2008-03-28 | 1 | -0/+19 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9120 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Added support for regexp flags like ignoring case in the :requirements part ↵ | David Heinemeier Hansson | 2008-03-28 | 1 | -2/+144 |
| | | | | | | of routes declarations (closes #11421) [NeilW] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9115 5ecf4fe2-1ee6-0310-87b1-e25e094e27de |