aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | This reverts commit 760fd1eb42038a64591036fc5d687afc98f272aa. Reason: We need a fully qualified path string here, not a Pathname.
| * 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
| | | | | | The default implementation joins everything with '_' and not with '-'
| * 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 ↵Jeff Dutil2011-09-061-1/+1
| | | | | | | | | | | | | | | | caching the failed build image. [ci skip]" This reverts commit a873ea8e9fa5613acf6bfde3cfa2b17daf9a43df. rdoc doesn't generate the image over https.
| * Use https for travis-ci build status image to prevent Github from caching ↵Jeff Dutil2011-09-061-1/+1
| | | | | | | | the failed build image. [ci skip]
| * Added note about adding a javascript runtime to Gemfile for production ↵Ryan Walker2011-09-061-0/+8
| | | | | | | | environment.
| * Fixed Apache configuration for gzipped assets: FilesMatch and LocationMatch ↵Marcus Ilgner2011-09-061-9/+9
| | | | | | | | cannot be nested.
| * 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
| | | | | | | | section.
| * 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
| | | | | | | | | | | | | | "Safe Buffer" should either be the constant with the class name, or go in lower case. I've chosen to follow the same terminology that is used in the AS core extensiong guide, "safe string", though "safe buffer" is also used elsewhere, we should pick one.
* | Merge pull request #2931 from dmathieu/safe_gsub_docVijay Dev2011-09-081-6/+12
|\ \ | | | | | | better method documentation on disable safe string methods
| * | 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
|\ \ | | | | | | make gsub and sub unavailable in SafeBuffers - Closes #1555
| * | 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
|\ \ | | | | | | Include ActiveRecord SQLServer Adapter by @metaskills in new application generator.
| * | Thanks to the hard work of Ken Collins ( @metaskills ) on the ActiveRecord ↵Wayne E. Seguin2011-09-071-2/+3
|/ / | | | | | | | | | | | | | | SQLServer Adapter ( https://github.com/rails-sqlserver/activerecord-sqlserver-adapter ), AR SQLServer Adapter works for Linux, OSX and Windows. Thus the sqlserver adapter should include so that users may use it with the new application generator: rails new w00t -d sqlserver ...
* | Use Travis https build status image in order to prevent GitHub fromVijay Dev2011-09-082-3/+5
| | | | | | | | | | | | | | | | caching the http version. The syntax for including an https image url in RDoc taken from http://about.travis-ci.org/docs/user/status-images. Having this in a line of its own now to make regex replacement for the API simpler!
* | 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
| | | | | | | | | | | | * https://github.com/rails/rails: Postgresql adapter: added current_schema check for table_exists? Postgresql adapter: added current_schema check for table_exists?
* | 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.
| * | 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
|\ \ \ | | | | | | | | Refactor assets tests to use add_to_config
| * | | Refactor assets tests to use add_to_config instead of creating initializers ↵Guillermo Iguaran2011-09-061-13/+14
| | | | | | | | | | | | | | | | with config values
* | | | Merge pull request #2499 from akaspick/assert_select_email_fixJon Leighton2011-09-072-2/+21
|\ \ \ \ | | | | | | | | | | Fix assert_select_email to work on non-multipart emails as well as converting the Mail::Body to a string to prevent errors.
| * | | | fix assert_select_email to work on non-multipart emails as well as ↵Andrew Kaspick2011-08-112-2/+21
| | | | | | | | | | | | | | | | | | | | converting the Mail::Body to a string to prevent errors.
* | | | | Merge pull request #2911 from toolmantim/patch-1Jon Leighton2011-09-071-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Make sure require_tzinfo only calls Kernel#require if TZInfo isn't alread
| * | | | Make sure require_tzinfo only calls Kernel#require if TZInfo isn't already ↵Tim Lucas2011-09-071-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | present. This wasn't a problem when require_tzinfo was only called from TimeZone#initialize, but now it's being called for every lookup to TimeZone.[] (via lazy_zones_map) TimeZone lookup can occur when unmarshalling TimeWithZone objects, which is where I first saw the big slowdown (500ms for each Rails action that loaded from Rails.cache)
* | | | Merge pull request #2905 from nhocki/patch-1Vijay Dev2011-09-071-1/+1
|\ \ \ \ | | | | | | | | | | Fixing small typo in the `record_key_for_dom_id` documentation.
| * | | | Nicolás Hock Isaza2011-09-061-1/+1
| | |/ / | |/| | | | | | | | | | | | | | Fixing `record_key_for_dom_id` documentation. The default implementation joins everything with '_' and not with '-'
* | | | Don't include any of includes, preload, joins, eager_load in the through ↵Jon Leighton2011-09-072-4/+6
| | | | | | | | | | | | | | | | association scope.
* | | | Merge pull request #2485 from akaspick/exists_fixJon Leighton2011-09-072-1/+12
|\ \ \ \ | |/ / / |/| | | fix exists? to return false if passed nil (which may come from a missing
| * | | fix exists? to return false if passed nil (which may come from a missing URL ↵Andrew Kaspick2011-08-102-1/+12
| | | | | | | | | | | | | | | | param)
* | | | Merge pull request #2897 from rsutphin/ar31-remove_connectionAaron Patterson2011-09-063-3/+22
| | | | | | | | | | | | | | | | Patch for issue #2820