aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Pull up a method we only use once.Aaron Patterson2011-09-081-5/+1
* Conditions must never be equalAaron Patterson2011-09-081-6/+1
* Merge pull request #2757 from andmej/first_or_create_pull_requestJon Leighton2011-09-086-7/+277
|\
| * Using more precise method signatures for AR::Relation#first_or_create family ...Andrés Mejía2011-09-061-6/+6
| * Adding first example with no arguments to AR::Relation#first_or_create and re...Andrés Mejía2011-09-061-15/+15
| * Adding `first_or_new` documentation to the AR Querying guide.Nicolas Hock Isaza2011-08-301-1/+1
| * Adding first_or_create, first_or_create!, first_or_new and first_or_build to ...Andrés Mejía2011-08-306-7/+277
* | Remove failing test which was wrongly introduced.Jon Leighton2011-09-081-5/+0
* | revert the changes from c60995f3 - related to marking sub,gsub as unavailable...Vijay Dev2011-09-091-20/+1
* | delete the CHANGELOG entry re SafeBuffer and sub/gsub, since it has been reve...Xavier Noria2011-09-081-2/+0
* | Revert removing gsub and sub from safe buffer.José Valim2011-09-085-63/+45
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-085-28/+56
|\ \
| * | getting_started.textile section 6: Correct file names in tabledharmatech2011-09-071-3/+3
| * | Revert "Rails.root is a Pathname, no need to use File.join first."Vijay Dev2011-09-071-1/+1
| * | copy edit assets guideVijay Dev2011-09-071-19/+19
| * | getting_started.textile: Fix another typodharmatech2011-09-071-1/+1
| * | Fixing `record_key_for_dom_id` documentation. Nicolás Hock Isaza2011-09-071-1/+1
| * | Rails.root is a Pathname, no need to use File.join first.Joost Baaij2011-09-071-1/+1
| * | Revert "Use https for travis-ci build status image to prevent Github from cac...Jeff Dutil2011-09-061-1/+1
| * | Use https for travis-ci build status image to prevent Github from caching the...Jeff Dutil2011-09-061-1/+1
| * | Added note about adding a javascript runtime to Gemfile for production enviro...Ryan Walker2011-09-061-0/+8
| * | Fixed Apache configuration for gzipped assets: FilesMatch and LocationMatch c...Marcus Ilgner2011-09-061-9/+9
| * | Change hyphen to underscore.Uģis Ozols2011-09-061-4/+4
| * | getting_started.textile: fix minor typodharmatech2011-09-051-1/+1
| * | Add reference about "bundle install --without assets" in Precompiling Assets ...Guillermo Iguaran2011-09-041-0/+2
| * | Add CoffeeScript example to JavaScript and ERB sectionGuillermo Iguaran2011-09-041-1/+7
| * | Add JavaScript and ERB section to Asset GuideGuillermo Iguaran2011-09-041-0/+12
| * | Fix grammar for content_tag_for and div_for docs.Hendy Tanata2011-09-052-3/+3
| * | clarify where the branch name will existRay Baxter2011-09-041-1/+1
* | | mention the issue number for future referenceXavier Noria2011-09-081-1/+1
* | | registers removal of sub and friends for safe strings in the CHANGELOGXavier Noria2011-09-081-0/+2
* | | this should have gone with the previous commitXavier Noria2011-09-082-6/+6
* | | copy-edits a couple of exception messagesXavier Noria2011-09-081-4/+4
* | | Merge pull request #2931 from dmathieu/safe_gsub_docVijay Dev2011-09-081-6/+12
|\ \ \
| * | | better method documentation on disable safe string methodsDamien Mathieu2011-09-081-6/+12
|/ / /
* | | Merge pull request #2248 from dmathieu/safe_gsubJosé Valim2011-09-085-45/+76
|\ \ \
| * | | remove support of symbols on classify and camelizeDamien Mathieu2011-09-084-34/+52
| * | | make gsub and sub unavailable in SafeBuffers - Closes #1555Damien Mathieu2011-09-082-11/+24
|/ / /
* | | LRU cache in mysql and sqlite are now per-process caches.Aaron Patterson2011-09-075-22/+82
* | | fixing file nameAaron Patterson2011-09-071-0/+0
* | | LRU should cache per process in postgresql. fixes #1339Aaron Patterson2011-09-072-10/+37
* | | Merge pull request #2922 from wayneeseguin/masterAaron Patterson2011-09-071-2/+3
|\ \ \
| * | | Thanks to the hard work of Ken Collins ( @metaskills ) on the ActiveRecord SQ...Wayne E. Seguin2011-09-071-2/+3
|/ / /
* | | Use Travis https build status image in order to prevent GitHub fromVijay Dev2011-09-082-3/+5
* | | fixing view queriesAaron Patterson2011-09-071-3/+5
* | | use the supplied bind valuesAaron Patterson2011-09-071-1/+1
* | | Merge commit 'refs/pull/2909/head' of https://github.com/rails/rails into rawrAaron Patterson2011-09-072-6/+10
* | | Merge pull request #2914 from yahonda/add_rownum_to_test_first_and_lastJon Leighton2011-09-071-2/+2
|\ \ \
| * | | Add ROWNUM to test first and last to support Oracle.Yasuo Honda2011-09-071-2/+2
* | | | Merge pull request #2904 from guilleiguaran/refactor-assets-testsSantiago Pastorino2011-09-071-13/+14
|\ \ \ \