aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix url_for when options is nilRafael Mendonça França2012-04-051-1/+1
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-058-54/+41
|\
| * lets not show too much output and shadow the intention [ci skip]Vijay Dev2012-04-051-20/+3
| * minor fixes [ci skip]Vijay Dev2012-04-051-2/+2
| * fix boolean value in guide [ci skip]Vijay Dev2012-04-051-1/+1
| * Revert "Update activemodel rdoc links"Vijay Dev2012-04-051-12/+12
| * Fix slightly awkward English in Action Caching section of Caching With Rails ...Cheah Chu Yeow2012-04-051-1/+1
| * Add AC record identifier example with not-persisted objectAlexey Vakhov2012-04-051-0/+1
| * Small improvements added to getting startedSandip Ransing2012-04-051-5/+5
| * Revert "update ActionPack README links"Vijay Dev2012-04-051-10/+10
| * update ActionPack README linksHrvoje Šimić2012-04-051-10/+10
| * Update activemodel rdoc linksJonathan Mazin2012-04-041-12/+12
| * Updated migrations.textile to change :integer on line 807 to :boolean, as it ...Ethan Mick2012-04-041-1/+1
| * Improve config.assets.initialize_on_precompile guide.Hendy Tanata2012-04-041-2/+2
| * Merge branch 'master' of github.com:lifo/docrailsHrvoje Šimić2012-04-041-10/+10
| |\
| | * Revert "update ActionPack README links"Vijay Dev2012-04-041-10/+10
| * | removed deprecated methods and middlewaresHrvoje Šimić2012-04-041-30/+34
| |/
| * added example, removed blank linesHrvoje Šimić2012-04-042-14/+13
| * update ActionPack README linksHrvoje Šimić2012-04-041-10/+10
* | Merge pull request #5182 from castlerock/content_tag_instead_stringXavier Noria2012-04-051-2/+2
|\ \
| * | content_tag used instead string for optionVishnu Atrai2012-02-261-2/+2
* | | Merge pull request #5750 from ahoward/masterAaron Patterson2012-04-052-2/+22
|\ \ \
| * | | url_for: avoid a nil check. unroll a loop. handle most common case 1st.ara.t.howard2012-04-051-18/+13
| * | | carefully and quickly merge url_for optionsara.t.howard2012-04-042-1/+26
* | | | Merge pull request #5707 from morgoth/remove-unnecessary-block-in-fetchXavier Noria2012-04-051-1/+1
|\ \ \ \
| * | | | removed unnecessary block when using fetchWojciech Wnętrzak2012-04-021-1/+1
* | | | | Merge pull request #4446 from ayamomiji/patch-1José Valim2012-04-052-1/+8
|\ \ \ \ \
| * | | | | prevent the cache sweeper ignores NoMethodErrorayaya2012-03-292-1/+8
* | | | | | Merge pull request #3084 from esad/masterXavier Noria2012-04-051-0/+2
|\ \ \ \ \ \
| * | | | | | Add a missing require for 'active_support/deprecation' in Module#deprecateEsad Hajdarevic2011-09-201-0/+2
* | | | | | | Merge pull request #5747 from mneisen/patch-1Xavier Noria2012-04-051-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Optimistic locking: lock_version needed type information.Martin Eisenhardt2012-04-051-1/+1
|/ / / / / /
* | | | | | Merge pull request #5716 from jurriaan/tr-gsub-cleanupSantiago Pastorino2012-04-0417-20/+20
|\ \ \ \ \ \
| * | | | | | Updated/changed useless tr/gsubsJurriaan Pruis2012-04-0317-20/+20
* | | | | | | Merge pull request #5188 from jlxw/patch-1Santiago Pastorino2012-04-041-1/+1
|\ \ \ \ \ \ \
| * | | | | | | logger.silence is deprecatedjlxw2012-02-271-1/+1
* | | | | | | | Merge pull request #5733 from oscardelben/patch-5Santiago Pastorino2012-04-041-2/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | No need to extend ActiveSupport::Extend hereOscar Del Ben2012-04-041-2/+0
|/ / / / / / /
* | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-048-25/+83
|\ \ \ \ \ \ \
| * | | | | | | Revert "rails 4 will support ruby version 1.9.4 or higher"Vijay Dev2012-04-041-1/+1
| * | | | | | | Fix AC responder exampleAlexey Vakhov2012-04-041-1/+1
| * | | | | | | typo mistake fixedSandip Ransing2012-04-041-2/+2
| * | | | | | | rails 4 will support ruby version 1.9.4 or higherSandip Ransing2012-04-041-1/+1
| * | | | | | | Fixed small typoFernando Briano2012-04-031-1/+1
| * | | | | | | also <text> replaced by <plain>Mikhail Dieterle2012-04-041-4/+4
| * | | | | | | Changed engines guide not to use a css tag. <plain> will do just fine. Mikhail Dieterle2012-04-031-2/+2
| * | | | | | | Remove non-obligatory params in AC respond_to examplesAlexey Vakhov2012-04-031-2/+2
| * | | | | | | Remove unnecessary articles.Waseem Ahmad2012-04-031-3/+3
| * | | | | | | Merge branch 'master' of github.com:lifo/docrailsHrvoje Šimić2012-04-022-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Revert "parse <css> block as code (used in engines guide) "Vijay Dev2012-04-021-1/+1