| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add support for specifying locals in view tests with assert template [#4927 ↵ | David Chelimsky | 2010-06-22 | 2 | -3/+28 |
| | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | removed 'unless const_defined?' code smell | Josh Kalderimis | 2010-06-21 | 6 | -47/+39 |
| | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Merge remote branch 'rails/master' | Xavier Noria | 2010-06-20 | 16 | -205/+343 |
| |\ | | | | | | | | | Conflicts: actionpack/lib/abstract_controller/base.rb | ||||
| | * | Use the new ActiveSupport::FileUpdateChecker instead of RoutesReloader. | José Valim | 2010-06-20 | 1 | -1/+1 |
| | | | |||||
| | * | Fixed date_select date_separator when discard_month and/or discard_day are ↵ | Thibaud Guillaume-Gentil | 2010-06-20 | 1 | -2/+4 |
| | | | | | | | | | | | | | true [#4856 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | Make sure a namespaced <%= render form %> still renders the _form partial ↵ | Jan De Poorter | 2010-06-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | [#4784 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | Use Rack::Utils.bytesize when calculating content-length of exception pages. ↵ | Tarsoly András | 2010-06-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | [#4727 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | remove executable permission from files that don't need it. [#4802 ↵ | rohit | 2010-06-20 | 1 | -0/+0 |
| | | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | Support render_template in view tests. Useful for specifying which | David Chelimsky | 2010-06-20 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | partials are rendered under different conditions. [#4903 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | Don't use module to work out shallow name prefix and path as it may not ↵ | Andrew White | 2010-06-20 | 1 | -9/+17 |
| | | | | | | | | | | | | | accurately reflect the actual namespace [#4899 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | Make polymorphic_url and scaffolding work with uncountable resources [#3930 ↵ | Andrew White | 2010-06-20 | 2 | -4/+13 |
| | | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | Accept an object for :constraints option [#4904 state:resolved] | Andrew White | 2010-06-20 | 1 | -1/+1 |
| | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | Merge branch 'master' of github.com:rails/rails | José Valim | 2010-06-20 | 4 | -14/+46 |
| | |\ | |||||
| | | * | option_groups_from_collection_for_select should return HTML-safe string ↵ | Wincent Colaiuta | 2010-06-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | [#4879 state:resolved] Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
| | | * | Remove a relic of #request being in RackDelegation | wycats | 2010-06-19 | 2 | -6/+9 |
| | | | | |||||
| | | * | Custom resource routes should be scoped | Andrew White | 2010-06-19 | 1 | -7/+36 |
| | | | | | | | | | | | | | | | | | | | [#3765] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | | Clear DescendantsTracker on each request. | José Valim | 2010-06-19 | 1 | -4/+4 |
| | | | | |||||
| | * | | ActiveRecord and ActionPack now use the new descendants implementation. | José Valim | 2010-06-19 | 1 | -11/+2 |
| | |/ | |||||
| | * | form_for without :html and with :remote should not error | David Genord II | 2010-06-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | [#4902 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | fix for :shallow in router not generating helpers for create, update, and ↵ | Josh Kalderimis | 2010-06-18 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | | destroy actions when :only or :except are used [#4900 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | Make text_helpers methods which return valid html to return it as safe and ↵ | Santiago Pastorino | 2010-06-17 | 1 | -6/+14 |
| | | | | | | | | | | | | | | | | | sanitize the input always unless :sanitize => false is set [#4825 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| | * | Add shallow routing option to new router [#3765 status:committed] | Andrew White | 2010-06-17 | 1 | -156/+248 |
| | | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| | * | truncate() should not try to produce HTML-safe output | Wincent Colaiuta | 2010-06-17 | 1 | -8/+4 |
| | | | | | | | | | | | | | | | | | | | | | As discussed in Lighthouse ticket #4825 and ticket #4878, the truncate() method cannot guarantee safe output for all possible inputs/offsets, so it is best to leave the output unsafe so that it gets escaped when used in a view. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | | Take out documentation from DeprecatedMapper to discourage its usage. | Rizwan Reza | 2010-06-21 | 1 | -384/+0 |
| | | | |||||
| * | | Use h1 for titles. | Rizwan Reza | 2010-06-21 | 1 | -1/+1 |
| | | | |||||
| * | | Final touches and fixes. | Rizwan Reza | 2010-06-21 | 7 | -1/+9 |
| | | | |||||
| * | | Action View is now titled. | Rizwan Reza | 2010-06-21 | 1 | -1/+1 |
| | | | |||||
| * | | Action View is now titled. | Rizwan Reza | 2010-06-21 | 3 | -0/+5 |
| | | | |||||
| * | | Added title to some other files in actionpack/lib/action_view | Rizwan Reza | 2010-06-16 | 7 | -0/+9 |
| | | | |||||
| * | | Added titles and description. | Rizwan Reza | 2010-06-16 | 7 | -17/+37 |
| | | | |||||
| * | | Adds title and description where needed. | Rizwan Reza | 2010-06-16 | 15 | -22/+48 |
| | | | |||||
| * | | Fix a bunch of minor spelling mistakes | Evgeniy Dolzhenko | 2010-06-15 | 16 | -23/+23 |
| |\ \ | |/ |/| | |||||
| | * | Fix a bunch of minor spelling mistakes | Evgeniy Dolzhenko | 2010-06-11 | 16 | -23/+23 |
| | | | |||||
| * | | edit pass: the names of Rails components have a space, ie, "Active Record", ↵ | Xavier Noria | 2010-06-14 | 5 | -7/+7 |
| | | | | | | | | | not "ActiveRecord" | ||||
| * | | truncate safe method description changes | Neeraj Singh | 2010-06-14 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of git://github.com/rails/rails | Rizwan Reza | 2010-06-14 | 2 | -2/+2 |
| |\ \ | |||||
| | * | | render(:inline) in a layout before yield replaces original content | Neeraj Singh | 2010-06-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | [#4777 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | | removes spurious .rb in require | Xavier Noria | 2010-06-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | truncate documentation an examples added for :safe option | Santiago Pastorino | 2010-06-13 | 1 | -0/+10 |
| |/ / | |||||
| * | | Merge remote branch 'docrails/master' | Xavier Noria | 2010-06-12 | 1 | -1/+9 |
| |\ \ | |||||
| | * | | adds missing require for having ActiveSupport::InheritableOptions defined | Xavier Noria | 2010-06-11 | 1 | -0/+1 |
| | | | | |||||
| | * | | Updated all number helpers with :locale option. | Slobodan Kovacevic | 2010-06-11 | 1 | -1/+9 |
| | |/ | |||||
| * | | text_helper now escape the unsafe input instead of sanitizing | Santiago Pastorino | 2010-06-11 | 1 | -4/+4 |
| | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | Refactored duplication into a separate method. Dropped class variable. | Rizwan Reza | 2010-06-11 | 1 | -15/+17 |
| | | | |||||
| * | | Adding missing docs to delete cookies with :all which were added that way. | Rizwan Reza | 2010-06-11 | 1 | -1/+2 |
| | | | |||||
| * | | Took out the domain option logic to cookies.rb. | Rizwan Reza | 2010-06-11 | 3 | -22/+32 |
| | | | |||||
| * | | Moved Domain regexp to a constant and added comments. | Rizwan Reza | 2010-06-11 | 1 | -1/+8 |
| | | | |||||
| * | | The previous commit didn't work with complex domains, which is now fixed. | Rizwan Reza | 2010-06-11 | 1 | -4/+4 |
| | | | |||||
| * | | Add support for multi-subdomain session by setting cookie host in session ↵ | Rizwan Reza | 2010-06-11 | 2 | -1/+14 |
| | | | | | | | | | | | | | cookie so you can share session between www.example.com, example.com and user.example.com. [#4818 state:resolved] This reverts commit 330a89072a493aafef1e07c3558964477f85adf0. | ||||
| * | | adds missing require for having ActiveSupport::InheritableOptions defined | Xavier Noria | 2010-06-11 | 1 | -0/+1 |
| |/ | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |