aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsJamison Dance2010-08-2641-180/+187
|\
| * escape constant namesJoost Baaij2010-08-262-9/+9
| |
| * Reflect how CSRF protection now works and refer to the Security Guide for ↵Joost Baaij2010-08-261-36/+18
| | | | | | | | more information
| * cleanup of ActionController::Metal inline documentationJoost Baaij2010-08-265-51/+50
| |
| * Escape 'caching' when used in a sentence; remove unnessesary quotesJoost Baaij2010-08-263-12/+12
| |
| * Merge branch 'master' of github.com:lifo/docrailsJoost Baaij2010-08-263-10/+6
| |\
| | * Simplify render :partialJames Miller2010-08-262-2/+2
| | |
| | * Prefer modern idiom for rendering partials on a collectionJames Miller2010-08-261-8/+4
| | |
| * | Prevent any warnings from being printed during RDoc generationJoost Baaij2010-08-262-2/+2
| |/
| * Getting started guide: typoJames Miller2010-08-261-1/+1
| |
| * Link to gembundler.com instead of Github repoJames Miller2010-08-261-1/+1
| |
| * Merge remote branch 'rails/master'Xavier Noria2010-08-262-8/+7
| |\
| | * getting started guide: revises text wrt bundlerXavier Noria2010-08-261-5/+3
| | |
| | * revises a few link textsXavier Noria2010-08-262-3/+4
| | |
| * | Merge remote branch 'rails/master'Xavier Noria2010-08-2611-23/+54
| |\|
| | * change 'a SQL' to 'an SQL' as suggested by the api documentation guidelinesJaime Iniesta2010-08-264-12/+12
| | |
| | * lifecycle should be two words, life cycleJaime Iniesta2010-08-2610-15/+15
| | |
| | * Fix capture_helper.rb api documentation, unescaped script tag was breaking ↵Jaime Iniesta2010-08-261-1/+1
| | | | | | | | | | | | it on the content_for explanation
| | * Merge remote branch 'docrails/master'Xavier Noria2010-08-262-2/+2
| | |\
| | * | adds missing require for #parameterizeXavier Noria2010-08-261-0/+2
| | | |
| | * | Merge remote branch 'docrails/master'Xavier Noria2010-08-2616-103/+268
| | |\ \
| | * | | AS guide: Array.wrap vs splat is only valid for 1.8Xavier Noria2010-08-251-1/+1
| | | | |
| | * | | Catch mysql2 access denied errors in rake db:create [#5432 state:resolved]Andrew White2010-08-251-2/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
| | * | | use blank? instead of present?, mark SQL literals as SQL literalsAaron Patterson2010-08-251-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/relation/query_methods.rb
| | * | | no need to send on a public methodAaron Patterson2010-08-251-1/+1
| | | | |
| | * | | refactor select { is_a? } to grep()Aaron Patterson2010-08-251-1/+1
| | | | |
| | * | | mark SQL literals as SQL literalsAaron Patterson2010-08-251-1/+1
| | | | |
| | * | | better callstack reporting in deprecation messagesJakub Suder2010-08-251-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now the reported line is the first line in the stack that's outside Rails, which is the one that actually caused the problem in the first place [#5231 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| | * | | Remove rails info route from rake routes output [#5452 state:resolved]Andrew White2010-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| | * | | Make ActiveResource::InvalidRequestError more user friendlyMikel Lindsaar2010-08-252-2/+17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
| | * | | Use nested scope for routes defined at the :resources scope level (as in ↵Andrew White2010-08-242-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails 2.3) Signed-off-by: José Valim <jose.valim@gmail.com>
| * | | | change 'a SQL' to 'an SQL' as suggested by the api documentation guidelinesJaime Iniesta2010-08-264-12/+12
| | | | |
| * | | | lifecycle should be two words, life cycleJaime Iniesta2010-08-2610-15/+15
| | | | |
| * | | | Fix capture_helper.rb api documentation, unescaped script tag was breaking ↵Jaime Iniesta2010-08-261-1/+1
| | |_|/ | |/| | | | | | | | | | it on the content_for explanation
* / | | fix sentence fragment in validates_associated cautionJamison Dance2010-08-261-1/+1
|/ / /
* | / Revert "to_json => as_json"Xavier Noria2010-08-262-2/+2
| |/ |/| | | | | | | | | This reverts commit 7a6d8e4ad47d571541762a6c80cc3e1f6831bd40. Reason: The method that gives you a Ruby string with JSON source code is #to_json
* | - Fix non-ascii characters in headersAleksander Pohl2010-08-261-1/+2
| | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
* | to_json => as_jsonJames Miller2010-08-252-11/+11
| |
* | to_json => as_jsonJames Miller2010-08-252-2/+2
| |
* | Merge branch 'master' of github.com:lifo/docrailsJames Miller2010-08-251-0/+163
|\ \
| * | Restored top-level documentation for ActionController::Base.Joost Baaij2010-08-251-0/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | This information was lost in commit bd6b61be88dfe6eb1ff1dcc5c17542d804a842c7. This might have been intentional, but this class does represent the starting point for all things related to actions, and as such should document it. I couldn't find any trace of this documentation, which seems like a waste. Updated parts here and there to conform to current best practices.
* | | mysql2 is now the default, typosJames Miller2010-08-251-4/+4
| | |
* | | Fix typo, favour => favorJames Miller2010-08-251-14/+14
|/ /
* | fixed capitalizationJoost Baaij2010-08-251-8/+8
| |
* | change rdoc to conform to api guidelinesJoost Baaij2010-08-255-57/+60
| |
* | remove unwanted linebreakJoost Baaij2010-08-251-2/+2
| |
* | Restore consistency with the rest of the doc.Rémy Coutable2010-08-251-2/+2
| |
* | Fixed a missing simple quote.Rémy Coutable2010-08-251-1/+1
| |
* | minor formatting fixesNeeraj Singh2010-08-251-8/+6
|/
* :nodoc:s #unscoped until its behavior is more clear, now sometimes works, ↵Xavier Noria2010-08-251-1/+1
| | | | sometimes not