Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-01-17 | 96 | -2019/+2976 |
|\ | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/flash.rb | ||||
| * | Allow custom controller for resource(s) [#3703 state:resolved] | Joshua Peek | 2010-01-16 | 2 | -11/+11 |
| | | |||||
| * | Split ActionDispatch http in smaller chunks. | José Valim | 2010-01-16 | 8 | -431/+489 |
| | | |||||
| * | Add tests for simple match with namespace. | José Valim | 2010-01-15 | 1 | -0/+10 |
| | | |||||
| * | Add some implicit path tests to Subscriber. | José Valim | 2010-01-15 | 1 | -1/+18 |
| | | |||||
| * | Fix singleton resource named routes | Joshua Peek | 2010-01-15 | 2 | -2/+5 |
| | | |||||
| * | Fix const reference for SessionRestoreError | Joshua Peek | 2010-01-15 | 1 | -1/+1 |
| | | |||||
| * | Always join scoped paths with slashes | Joshua Peek | 2010-01-15 | 1 | -11/+17 |
| | | |||||
| * | Cleanup internal resource macro to use method helper shorthand | Joshua Peek | 2010-01-15 | 2 | -20/+26 |
| | | |||||
| * | Routing method shorthand shouldn't clobber :to options | Joshua Peek | 2010-01-15 | 2 | -2/+19 |
| | | |||||
| * | Move Flash into middleware | Joshua Peek | 2010-01-15 | 8 | -183/+223 |
| | | |||||
| * | Make HEAD method masquerade as GET so requests are routed correctly | Joshua Peek | 2010-01-15 | 6 | -8/+42 |
| | | |||||
| * | In heterogeneous collections, neither the @path nor the @template are ↵ | José Valim | 2010-01-15 | 2 | -1/+11 |
| | | | | | | | | available, so we need to tell that we are simply rendering a collection. | ||||
| * | Allow f.submit to be localized per object. | José Valim | 2010-01-15 | 2 | -3/+33 |
| | | |||||
| * | Remove URI object from ActiveResource notification, send the :mailer class ↵ | José Valim | 2010-01-15 | 1 | -4/+1 |
| | | | | | | | | in AM (like in AP#process_action) and remove locale instrumentation. | ||||
| * | Ensure log is flushed and tailed on failures. | José Valim | 2010-01-15 | 2 | -7/+37 |
| | | |||||
| * | Template rendering should include layout time. | José Valim | 2010-01-15 | 1 | -10/+10 |
| | | |||||
| * | Do not send the whole controller in notifications, cherry pick required pieces. | José Valim | 2010-01-15 | 4 | -20/+45 |
| | | |||||
| * | Small tweaks in ActionController subscriber messages format. | José Valim | 2010-01-15 | 2 | -3/+10 |
| | | |||||
| * | Move Dispatcher setup to Railties and add instrumentation hook. | José Valim | 2010-01-15 | 10 | -113/+163 |
| | | |||||
| * | Respect resources_path_names and :path_names options in new dsl | Joshua Peek | 2010-01-13 | 5 | -68/+133 |
| | | |||||
| * | optimise_named_routes is unnecessary | Joshua Peek | 2010-01-13 | 3 | -19/+0 |
| | | |||||
| * | Add documentation to f.submit and make scaffold generators use the new shortcut. | José Valim | 2010-01-14 | 1 | -15/+34 |
| | | |||||
| * | Ensure optional path scopes are properly handled. | José Valim | 2010-01-14 | 2 | -8/+64 |
| | | |||||
| * | Custom 'type' attribute support for text_field. [#3646 status:resolved] | Stephen Celis | 2010-01-14 | 2 | -1/+6 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Make check boxes accept :multiple as option so they can handle collections ↵ | José Valim | 2010-01-14 | 3 | -2/+20 |
| | | | | | | | | (such as HABTM). | ||||
| * | Call :to_model before working with the object. | José Valim | 2010-01-14 | 2 | -8/+13 |
| | | |||||
| * | Add possibility to use i18n translatios in submit FormHelper. | Carlos Antonio da Silva | 2010-01-14 | 3 | -14/+89 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Tidy up ActiveRecord and Views runtime information on process action logger. | José Valim | 2010-01-14 | 4 | -13/+16 |
| | | |||||
| * | Add router support for resources :only and :except actions | Joshua Peek | 2010-01-13 | 2 | -16/+56 |
| | | |||||
| * | Cool this routing test passes now | Joshua Peek | 2010-01-13 | 1 | -14/+13 |
| | | |||||
| * | Pass :as to resources to change the resource name | Joshua Peek | 2010-01-13 | 2 | -4/+31 |
| | | |||||
| * | Passing in a crud action overloads the default action instead of creating a | Joshua Peek | 2010-01-13 | 2 | -2/+26 |
| | | | | | | | | new member action. | ||||
| * | ControllerRuntime tests also use Rails::Subscriber::TestHelper. | José Valim | 2010-01-13 | 2 | -22/+32 |
| | | |||||
| * | Test fragment/page cache and send data/file notifications. | José Valim | 2010-01-13 | 3 | -17/+100 |
| | | |||||
| * | Add subscriber for ActionPack and move all logging inside it. | José Valim | 2010-01-13 | 19 | -269/+367 |
| | | |||||
| * | Improve ActionPack logger output. | José Valim | 2010-01-11 | 1 | -5/+8 |
| | | |||||
| * | Merge branch 'master' of git://github.com/rails/rails | José Valim | 2010-01-11 | 4 | -5/+37 |
| |\ | |||||
| | * | Cleanup junk metal and revise API | Joshua Peek | 2010-01-10 | 1 | -3/+25 |
| | | | | | | | | | | | | | | | API Change: Returning a "X-Cascade: pass" header triggers the cascade instead of a 404 response. | ||||
| | * | Javascript tests expects the old default of escaping HTML, make it so for now | David Heinemeier Hansson | 2010-01-10 | 2 | -0/+10 |
| | | | |||||
| | * | Use safe_concat instead of trying to html_safe! what might be a frozen string | David Heinemeier Hansson | 2010-01-10 | 1 | -2/+2 |
| | | | |||||
| * | | Provide useful information when instrumenting partials. | José Valim | 2010-01-11 | 1 | -8/+6 |
| |/ | |||||
| * | Raise an error if respond_with is invoked and no format is declared. | José Valim | 2010-01-10 | 6 | -74/+68 |
| | | |||||
| * | Ensure nested namespaces work as expected. | José Valim | 2010-01-10 | 2 | -7/+16 |
| | | |||||
| * | Fixes namespaced routes [#3673 status:resolved] | Joao Carlos | 2010-01-10 | 2 | -5/+13 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Fixed that PrototypeHelper#update_page should return html_safe [DHH] | David Heinemeier Hansson | 2010-01-08 | 2 | -1/+3 |
| | | |||||
| * | Fixed that much of DateHelper wouldn't return html_safe? strings [DHH] | David Heinemeier Hansson | 2010-01-08 | 3 | -5/+29 |
| | | |||||
| * | Fixed that fragment caching should return a cache hit as html_safe (or it ↵ | David Heinemeier Hansson | 2010-01-07 | 2 | -1/+3 |
| | | | | | | | | would all just get escaped) [DHH] | ||||
| * | Ensure that segments in default_url_options also work with format specified. | José Valim | 2010-01-07 | 2 | -2/+10 |
| | | |||||
| * | From now on, parameters defined in default_url_options can be absent from ↵ | José Valim | 2010-01-07 | 4 | -65/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | named routes. This allows the following setup to work: # app/controllers/application_controller.rb class ApplicationController def default_url_options(options=nil) { :locale => I18n.locale } end end # From your views and controllers: I18n.locale #=> :en users_url #=> "/en/users" users_url(:pl) #=> "/pl/users" user_url(1) #=> "/en/users/1" user_url(:pl, 1) #=> "/pl/users/1" user_url(1, :locale => :pl) #=> "/pl/users/1" If you provide all expected parameters, it still works as previously. But if any parameter is missing, it tries to assign all possible ones with the hash returned in default_url_options or the one passed straight to the named route method. Beware that default_url_options in ApplicationController is not shared with ActionMailer, so you are required to always give the locale in your email views. |