aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | 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
| | * | | | | | | wrong link to getting started guideMikhail Dieterle2012-04-031-1/+1
| * | | | | | | | update purpose of middlewareHrvoje Šimić2012-04-021-11/+66
| |/ / / / / / /
| * | | | | | | update to current rack middleware stackHrvoje Šimić2012-04-021-3/+6
| * | | | | | | parse <css> block as code (used in engines guide) Mikhail Dieterle2012-04-021-1/+1
| * | | | | | | Correct invalid route example [ci skip]Cezary Baginski2012-04-021-1/+1
* | | | | | | | the file update checker now also detects removed filesXavier Noria2012-04-032-26/+40
* | | | | | | | DATABASE_URL allows omission of database.ymlTim Pope2012-04-031-1/+3
* | | | | | | | use File.binread to pull in the schema cacheAaron Patterson2012-04-032-2/+2
* | | | | | | | Merge pull request #5723 from tiegz/minor_fixesJosé Valim2012-04-031-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | minor elsif/else typo fixTieg Zaharia2012-04-031-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #5713 from bolshakov/masterXavier Noria2012-04-031-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix typoArtyom Bolshakov2012-04-031-1/+1
* | | | | | | | Merge pull request #5708 from romanvbabenko/refactor/add_gem_filtersAaron Patterson2012-04-021-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Unnecessary uniqueness & force mapping has been removed at BacktraceCleaner#a...Roman V. Babenko2012-04-031-1/+1
* | | | | | | | Merge pull request #5695 from lest/patch-1Piotr Sarnacki2012-04-022-1/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | add type option to atom feed entry builderSergey Nartimov2012-04-012-1/+35
* | | | | | | | | fix formatting in engines guide; also removed a couple of non-existent images...Vijay Dev2012-04-021-35/+25
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Usage file in generators shouldn't be fetched only based on source_rootPiotr Sarnacki2012-04-013-5/+22
|/ / / / / / /
* | | | | | | Merge pull request #5694 from hardipe/masterSantiago Pastorino2012-04-011-4/+0
|\ \ \ \ \ \ \
| * | | | | | | Useless/Confusing method definition removedhardi2012-04-011-4/+0
* | | | | | | | Merge pull request #5684 from arunagw/warning_removed_railtiesVijay Dev2012-04-011-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | warning removed: `&' interpreted as argument prefixArun Agrawal2012-03-311-1/+1
* | | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-0110-19/+29
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |