Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | delete the CHANGELOG entry re SafeBuffer and sub/gsub, since it has been ↵ | Xavier Noria | 2011-09-08 | 1 | -2/+0 | |
| | | | | | | | | | | | | reverted | |||||
* | | | Revert removing gsub and sub from safe buffer. | José Valim | 2011-09-08 | 5 | -63/+45 | |
| |/ |/| | ||||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-08 | 5 | -28/+56 | |
|\ \ | ||||||
| * | | getting_started.textile section 6: Correct file names in table | dharmatech | 2011-09-07 | 1 | -3/+3 | |
| | | | ||||||
| * | | Revert "Rails.root is a Pathname, no need to use File.join first." | Vijay Dev | 2011-09-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | This reverts commit 760fd1eb42038a64591036fc5d687afc98f272aa. Reason: We need a fully qualified path string here, not a Pathname. | |||||
| * | | copy edit assets guide | Vijay Dev | 2011-09-07 | 1 | -19/+19 | |
| | | | ||||||
| * | | getting_started.textile: Fix another typo | dharmatech | 2011-09-07 | 1 | -1/+1 | |
| | | | ||||||
| * | | Fixing `record_key_for_dom_id` documentation. | Nicolás Hock Isaza | 2011-09-07 | 1 | -1/+1 | |
| | | | | | | | | | The default implementation joins everything with '_' and not with '-' | |||||
| * | | Rails.root is a Pathname, no need to use File.join first. | Joost Baaij | 2011-09-07 | 1 | -1/+1 | |
| | | | ||||||
| * | | Revert "Use https for travis-ci build status image to prevent Github from ↵ | Jeff Dutil | 2011-09-06 | 1 | -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 Dutil | 2011-09-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | the failed build image. [ci skip] | |||||
| * | | Added note about adding a javascript runtime to Gemfile for production ↵ | Ryan Walker | 2011-09-06 | 1 | -0/+8 | |
| | | | | | | | | | | | | environment. | |||||
| * | | Fixed Apache configuration for gzipped assets: FilesMatch and LocationMatch ↵ | Marcus Ilgner | 2011-09-06 | 1 | -9/+9 | |
| | | | | | | | | | | | | cannot be nested. | |||||
| * | | Change hyphen to underscore. | Uģis Ozols | 2011-09-06 | 1 | -4/+4 | |
| | | | ||||||
| * | | getting_started.textile: fix minor typo | dharmatech | 2011-09-05 | 1 | -1/+1 | |
| | | | ||||||
| * | | Add reference about "bundle install --without assets" in Precompiling Assets ↵ | Guillermo Iguaran | 2011-09-04 | 1 | -0/+2 | |
| | | | | | | | | | | | | section. | |||||
| * | | Add CoffeeScript example to JavaScript and ERB section | Guillermo Iguaran | 2011-09-04 | 1 | -1/+7 | |
| | | | ||||||
| * | | Add JavaScript and ERB section to Asset Guide | Guillermo Iguaran | 2011-09-04 | 1 | -0/+12 | |
| | | | ||||||
| * | | Fix grammar for content_tag_for and div_for docs. | Hendy Tanata | 2011-09-05 | 2 | -3/+3 | |
| | | | ||||||
| * | | clarify where the branch name will exist | Ray Baxter | 2011-09-04 | 1 | -1/+1 | |
| | | | ||||||
* | | | mention the issue number for future reference | Xavier Noria | 2011-09-08 | 1 | -1/+1 | |
| | | | ||||||
* | | | registers removal of sub and friends for safe strings in the CHANGELOG | Xavier Noria | 2011-09-08 | 1 | -0/+2 | |
| | | | ||||||
* | | | this should have gone with the previous commit | Xavier Noria | 2011-09-08 | 2 | -6/+6 | |
| | | | ||||||
* | | | copy-edits a couple of exception messages | Xavier Noria | 2011-09-08 | 1 | -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_doc | Vijay Dev | 2011-09-08 | 1 | -6/+12 | |
|\ \ \ | | | | | | | | | better method documentation on disable safe string methods | |||||
| * | | | better method documentation on disable safe string methods | Damien Mathieu | 2011-09-08 | 1 | -6/+12 | |
|/ / / | ||||||
* | | | Merge pull request #2248 from dmathieu/safe_gsub | José Valim | 2011-09-08 | 5 | -45/+76 | |
|\ \ \ | | | | | | | | | make gsub and sub unavailable in SafeBuffers - Closes #1555 | |||||
| * | | | remove support of symbols on classify and camelize | Damien Mathieu | 2011-09-08 | 4 | -34/+52 | |
| | | | | ||||||
| * | | | make gsub and sub unavailable in SafeBuffers - Closes #1555 | Damien Mathieu | 2011-09-08 | 2 | -11/+24 | |
|/ / / | ||||||
* | | | LRU cache in mysql and sqlite are now per-process caches. | Aaron Patterson | 2011-09-07 | 5 | -22/+82 | |
| | | | ||||||
* | | | fixing file name | Aaron Patterson | 2011-09-07 | 1 | -0/+0 | |
| | | | ||||||
* | | | LRU should cache per process in postgresql. fixes #1339 | Aaron Patterson | 2011-09-07 | 2 | -10/+37 | |
| | | | ||||||
* | | | Merge pull request #2922 from wayneeseguin/master | Aaron Patterson | 2011-09-07 | 1 | -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. Seguin | 2011-09-07 | 1 | -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 from | Vijay Dev | 2011-09-08 | 2 | -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 queries | Aaron Patterson | 2011-09-07 | 1 | -3/+5 | |
| | | | ||||||
* | | | use the supplied bind values | Aaron Patterson | 2011-09-07 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge commit 'refs/pull/2909/head' of https://github.com/rails/rails into rawr | Aaron Patterson | 2011-09-07 | 2 | -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_last | Jon Leighton | 2011-09-07 | 1 | -2/+2 | |
|\ \ \ | | | | | | | | | Add ROWNUM to test first and last to support Oracle. | |||||
| * | | | Add ROWNUM to test first and last to support Oracle. | Yasuo Honda | 2011-09-07 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Merge pull request #2904 from guilleiguaran/refactor-assets-tests | Santiago Pastorino | 2011-09-07 | 1 | -13/+14 | |
|\ \ \ \ | | | | | | | | | | | Refactor assets tests to use add_to_config | |||||
| * | | | | Refactor assets tests to use add_to_config instead of creating initializers ↵ | Guillermo Iguaran | 2011-09-06 | 1 | -13/+14 | |
| | | | | | | | | | | | | | | | | | | | | with config values | |||||
* | | | | | Merge pull request #2499 from akaspick/assert_select_email_fix | Jon Leighton | 2011-09-07 | 2 | -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 Kaspick | 2011-08-11 | 2 | -2/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | converting the Mail::Body to a string to prevent errors. | |||||
* | | | | | | Merge pull request #2911 from toolmantim/patch-1 | Jon Leighton | 2011-09-07 | 1 | -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 Lucas | 2011-09-07 | 1 | -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-1 | Vijay Dev | 2011-09-07 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fixing small typo in the `record_key_for_dom_id` documentation. | |||||
| * | | | | | Nicolás Hock Isaza | 2011-09-06 | 1 | -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 Leighton | 2011-09-07 | 2 | -4/+6 | |
| | | | | | | | | | | | | | | | | | | | | association scope. | |||||
* | | | | | Merge pull request #2485 from akaspick/exists_fix | Jon Leighton | 2011-09-07 | 2 | -1/+12 | |
|\ \ \ \ \ | |/ / / / |/| | | | | fix exists? to return false if passed nil (which may come from a missing |