aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Play nice with some lint patterns"Vijay Dev2012-05-061-4/+3
| | | | | | This reverts commit 7f536f9158588b66c0e5a6aa8772b919812f9cb9. Reason: If at all this is done, this should be done in rails master.
* Added reference to I18n.localize, as discussed here:Ernesto Tagwerker2012-05-041-0/+3
| | | | https://github.com/rails/rails/issues/4027
* Play nice with some lint patternsKristian Freeman2012-05-041-3/+4
|
* Editing log levels to reflect this doc: ↵Mike Manewitz2012-05-041-1/+1
| | | | http://api.rubyonrails.org/classes/ActiveSupport/BufferedLogger/Severity.html
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-0420-377/+150
|\
| * Fix ActiveModel README exampleAlexey Vakhov2012-05-041-1/+1
| |
| * mention database mapping in getting started guideOscar Del Ben2012-05-041-1/+4
| |
| * Remove vestiges of the http_only! config from configuring guideCarlos Antonio da Silva2012-05-031-8/+0
| |
| * Update command line guideOscar Del Ben2012-05-031-4/+2
| |
| * I found it strange that this guide is redirecting questions to a specific ↵Paul McMahon2012-05-031-2/+1
| | | | | | | | person. Heiko Webers' (@hawe) last blog post is a year and a half old, so it's not obvious that he's still active with Rails security. If he is, feel free to revert.
| * Corrected the name of the module that should be included to get the url helpers.Anuj Dutta2012-05-031-1/+1
| |
| * TypoOscar Del Ben2012-05-021-1/+1
| |
| * Mention mac os x installation tools on getting started guideOscar Del Ben2012-05-021-1/+4
| |
| * Remove tags from getting started guide and adapt some of the content toOscar Del Ben2012-05-023-216/+7
| | | | | | | | the new guide
| * Rewrite refactoring section in getting started guideOscar Del Ben2012-05-024-77/+34
| |
| * Rewrite comments action in getting started guideOscar Del Ben2012-05-023-21/+26
| |
| * Changed code examples to have a consistent code styling [ci skip]Ayrton De Craene2012-05-021-33/+33
| |
| * Add note about image_tag('') issue in Asset Pipeline guide (see rails issue ↵Michael Pearson2012-05-021-0/+2
| | | | | | | | #3080)
| * Fix example url in text helperAlexey Vakhov2012-05-021-1/+1
| |
| * Fix form tag with non GET/POST method exampleAlexey Vakhov2012-05-021-1/+1
| |
| * Documentation fix in options_for_select helper. Fixed display errors caused ↵Rodrigo Pavano2012-05-011-9/+26
| | | | | | | | by mixing Ruby and HTML code inside the same pre tag [ci skip]
| * Add empty rows to improve readability. [ci skip]Edward Tsech2012-05-011-0/+2
| |
| * Add few lines to describe how aggregation part caching works. [ci skip]Edward Tsech2012-05-011-0/+4
| |
| * simpler wording and explanationsHrvoje Šimić2012-05-012-11/+11
| |
| * Lowercase.Ben Pickles2012-05-011-1/+1
| |
* | Merge pull request #5650 from sekrett/masterVijay Dev2012-05-041-1/+1
|\ \ | | | | | | Documentation fix: Change the example for habtm association to use proc according to changelog
| * | Change the example for habtm association to use proc according to changelogAlexander Zubkov2012-03-291-1/+1
| | |
* | | actually don't need to expand the aggregates at allJon Leighton2012-05-041-11/+1
| | |
* | | #to_sym is unnecessaryJon Leighton2012-05-041-3/+3
| | |
* | | de-globalise methodJon Leighton2012-05-043-9/+6
| | |
* | | extract code from AR::BaseJon Leighton2012-05-043-35/+31
| | |
* | | clean up implementation of dynamic methods. use method compilation etc.Jon Leighton2012-05-048-322/+204
| | |
* | | Merge pull request #6148 from twinturbo/head-fixJosé Valim2012-05-032-1/+87
|\ \ \ | | | | | | | | Make ActionController#head pass rack-link
| * | | Remove content-length as welltwinturbo2012-05-032-2/+9
| | | |
| * | | Make ActionController#head pass rack-linktwinturbo2012-05-032-1/+80
| | | |
* | | | Merge pull request #5821 from Deradon/fix-engine-tasksPiotr Sarnacki2012-05-032-1/+37
|\ \ \ \ | | | | | | | | | | Provided fix for calling rake tasks within mountable engines
| * | | | Provided fix for calling rake tasks within mountable enginesPatrick Helm2012-04-122-1/+37
| | | | |
* | | | | Merge pull request #4452 from tapajos/e5425c8f68fbb720fcbf4b14e1f154ac27dbbbedAaron Patterson2012-05-032-1/+8
|\ \ \ \ \ | | | | | | | | | | | | Fix cache (FileStore) clear to keep .gitkeep.
| * | | | | Cache (FileStore) clear should keep .gitkeepMarcos Tapajos2012-01-132-1/+8
| | | | | |
* | | | | | Merge pull request #6012 from avakhov/dbconsole-testPiotr Sarnacki2012-05-032-22/+162
|\ \ \ \ \ \ | | | | | | | | | | | | | | Cover Rails::DBConsole with tests
| * | | | | | Add Rails::DBConsole testsAlexey Vakhov2012-05-022-22/+162
| | | | | | |
* | | | | | | Merge pull request #4496 from makeable/masterAaron Patterson2012-05-031-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Active Support Cache - race_condition_ttl should be an integer
| * | | | | | | race_condition_ttl should be an integerMatt Williams2012-01-171-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #6144 from bogdan/routesJosé Valim2012-05-031-2/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | RouteSet: optimize routes generation when globbing is used
| * | | | | | | | RouteSet: optimize routes generation when globbing is usedBogdan Gusiev2012-05-031-2/+5
|/ / / / / / / /
* | | | | | | | Merge pull request #6135 from alindeman/assert_redirect_to_with_regexpJosé Valim2012-05-033-13/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Allows assert_redirected_to to accept a regular expression
| * | | | | | | | Allows assert_redirected_to to accept a regular expressionAndy Lindeman2012-05-033-13/+26
|/ / / / / / / /
* | | | | | | | Merge pull request #6139 from pwim/extract_options-actionpackJosé Valim2012-05-031-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | use extract_options!
| * | | | | | | | use extract_options!Paul McMahon2012-05-031-1/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #6141 from mhfs/mailer_tweeksJosé Valim2012-05-032-14/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Minor ActionMailer tweaks