aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-11-152-9/+230
|\
| * Merge branch 'master' of github.com:lifo/docrailsRyan Bigg2010-11-151-0/+18
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of github.com:lifo/docrails: Getting Started guide: remove calls to f.error_messages as it has been removed from Rails deliver_* is no more removed unnecessary indentation added note with example for using flash in redirection corrected sample code to clear @_current_user class variable also the partial option is not required for simple partial rendering colorize_logging is a Rails General Configuration option not a specific option of ActiveRecord Fixed the name of the 'generator option' this reads better, i don't know what the other 'so on' are, doesn't help reader imho added missing word to clear up meaning in my previous commit Add a note to TextHelpers making explicit their default behavior of not escaping but sanitizing. removed indentation, for code style consistency and readibility Use Rails.logger, not ActiveRecord::Base.logger removed etc. not require added missing space and minor rewording corrected to Rails 3 syntax for declaring resources Fixes ActionMailer example error
| | * Add a note to TextHelpers making explicit their default behavior of not ↵José Valim2010-11-081-0/+18
| | | | | | | | | | | | escaping but sanitizing.
| * | Document the constraints methodRyan Bigg2010-11-141-1/+55
| | |
| * | Add documentation for :path_names option on resourcesRyan Bigg2010-11-131-0/+8
| | |
| * | See the scope method for documentation for namespace's shallow_path optionRyan Bigg2010-11-131-0/+3
| | |
| * | Add documentation for the mount method in ActionDispatch's MapperRyan Bigg2010-11-131-0/+17
| |/
| * Fix indentation for :as option documentation on the namespace methodRyan Bigg2010-11-071-4/+4
| |
| * Document the :shallow_path option for scopeRyan Bigg2010-11-071-0/+19
| |
| * Indent final comment for :path optionRyan Bigg2010-11-071-1/+1
| |
| * Indent code example for :as optionRyan Bigg2010-11-071-3/+3
| |
| * Document the :as option for the scope methodRyan Bigg2010-11-071-0/+10
| |
| * Space between module option documentation and path documentationRyan Bigg2010-11-071-0/+1
| |
| * Fix indentation on comment for :path optionRyan Bigg2010-11-071-1/+1
| |
| * Document the :as option for the namespace methodRyan Bigg2010-11-071-0/+8
| |
| * Document the :module option for namespaceRyan Bigg2010-11-071-0/+15
| |
| * Document the :path option for namespaceRyan Bigg2010-11-071-0/+11
| |
| * Begin to document the namespace method for AD's MapperRyan Bigg2010-11-071-0/+15
| |
| * Document the controller method for AD's MapperRyan Bigg2010-11-071-0/+6
| |
| * Document the defaults methodRyan Bigg2010-11-071-0/+5
| |
| * Document the :module and :path options for the scope method.Ryan Bigg2010-11-071-4/+13
| |
| * Separate comments and examples with "Examples" header.Ryan Bigg2010-11-071-0/+2
| |
| * Fix where the documentation says "photos", but the example shows "posts" or ↵Ryan Bigg2010-11-071-4/+4
| | | | | | | | "comments" by switching both to simply "posts"
| * Add further documentation + examples for the get, post, put and delete ↵Ryan Bigg2010-11-071-1/+21
| | | | | | | | methods in ActionDispatch::Routing::Mapper::HttpHelpers
* | Add f.submit to forms just to show the most common use caseSantiago Pastorino2010-11-141-0/+12
| |
* | Merge branch 'spastorino-master'Santiago Pastorino2010-11-141-2/+2
|\ \
| * | This doesn't make sense hereSantiago Pastorino2010-11-141-2/+2
| | |
* | | Add empty line between previous method and RDoc of submit to allow RDoc ↵Santiago Pastorino2010-11-141-0/+1
|/ / | | | | | | appear on api.rubyonrails.org
* | Tests added for rendering partial with layout, when the partial contains ↵Santiago Pastorino2010-11-133-0/+10
| | | | | | | | another render layout with block call added missing fixtures
* | Tests added for rendering partial with layout, when the partial contains ↵Santiago Pastorino2010-11-131-0/+15
| | | | | | | | another render layout with block call
* | Make collection and collection_from_object methods return an arraySantiago Pastorino2010-11-131-3/+4
| | | | | | | | | | | | This transforms for instance scoped objects into arrays and avoid unneeded queries [#5958 state:committed]
* | provide better error message if path is uri [#5914 state:resolved]Neeraj Singh2010-11-112-3/+16
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | fields_for should treat ActiveRecord::Relation as an arrayNeeraj Singh2010-11-113-2/+33
| | | | | | | | | | | | [#5795 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Remove inline comment.José Valim2010-11-111-17/+17
| |
* | Make after_filter halt when before_filter renders or redirects [#5648 ↵Marcelo Giorgi2010-11-112-2/+81
| | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Fix render partial with layout and no blockCarlos Antonio da Silva2010-11-112-0/+12
| | | | | | | | | | | | | | | | When using a render :partial with :layout call, without giving a block, if the given :partial had another render :partial call, the layout was not being rendered. This commit fixes this context by storing variables before rendering the partial, so they are not overrided in any successive call to render partials down the path. All ActionPack tests are ok.
* | Fix issue with rendering partials and then yielding inside a render layout callCarlos Antonio da Silva2010-11-115-0/+26
| | | | | | | | | | | | | | The given block was never being executed when another render :partial call existed before the yield call, due to the block being overriden. This commit also adds some more tests to render with :layout option.
* | patching to ensure separator is printed with order [#5816 state:resolved]Aditya Sanghi2010-11-112-0/+43
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Allow AR Session Store to be renewedJosé Valim2010-11-111-0/+20
| |
* | syncs CHANGELOGs for 3.0.2 in 3-0-stable with the ones in masterXavier Noria2010-11-091-2/+4
| |
* | registers number_to_currency's :negative_format in the CHANGELOGXavier Noria2010-11-091-0/+2
| |
* | Strip regexp anchors from rake routes output [#5934 state:resolved]Andrew White2010-11-091-1/+2
| |
* | Make safe_append= live on AV::OutputBuffer not AS::SafeBufferMichael Koziarski2010-11-081-0/+1
| | | | | | | | | | | | Conflicts: actionpack/lib/action_view/template/handlers/erb.rb
* | Added support for Erubis <%== tagJan Maurits Faber2010-11-082-1/+15
| | | | | | | | | | | | | | <%== x %> is syntactic sugar for <%= raw(x) %> Signed-off-by: Michael Koziarski <michael@koziarski.com> [#5918 status:committed]
* | Make cookies hash in ActionDispatch::TestProcess indifferent access [#5761 ↵David Trasbo2010-11-072-1/+19
| | | | | | | | | | | | state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Move @assigns from the controller to the test itselfSantiago Pastorino2010-11-062-1/+1
| |
* | Fix problems trying to functional test AC::Metal controllersSantiago Pastorino2010-11-063-11/+10
| | | | | | | | [#5393 state:committed]
* | Correctly handle the case of an API response that returns a hash by treating ↵Chris Eppstein2010-11-062-1/+17
| | | | | | | | a single hash argument as the resource instead of as options.
* | Just initialize options with an empty hashSantiago Pastorino2010-11-031-2/+1
| |
* | made a pass to the docs of :negative_formatXavier Noria2010-11-031-5/+7
| |